Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,937 Commits 3 Branches 0 Tags
fed9c11a994281feb72bd8a63e13eaa69658d3a8
Commit Graph

32205 Commits

Author SHA1 Message Date
Jeff Brown
fed9c11a99 am f2930d78: am c3112608: Merge "Don\'t dump sql bindargs unless verbose mode is requested." into jb-mr2-dev 
* commit 'f2930d783ac52d89cc8fc6db3bed7989544a9cbc':
  Don't dump sql bindargs unless verbose mode is requested.
 2013-05-01 17:57:15 -07:00
Jeff Brown
f2930d783a am c3112608: Merge "Don\'t dump sql bindargs unless verbose mode is requested." into jb-mr2-dev 
* commit 'c31126088fea61a9b5ba6cdb1fd2791e86800a8a':
  Don't dump sql bindargs unless verbose mode is requested.
 2013-05-01 17:54:34 -07:00
Jeff Brown
c31126088f Merge "Don't dump sql bindargs unless verbose mode is requested." into jb-mr2-dev 2013-05-02 00:52:26 +00:00
Jeff Sharkey
037db6cfd0 Merge "External storage provider, document picker UI." 2013-05-02 00:46:46 +00:00
Jeff Sharkey
9e0036ed7d External storage provider, document picker UI. 
Continuing to flesh out storage backends by adding an external
storage document backend.  Still rough, but it can traverse files
and directories.

Early pass at OPEN/CREATE_DOC picker UI, which offers to traverse
any known storage backends.  Supports opening subdirectories and
returning a picked file.

Change-Id: Idc3554036b3816a93d9b465ee8a620746859d2ae
 2013-05-01 17:44:42 -07:00
Jeff Sharkey
863b117a3a Merge "Start fleshing out new storage APIs." 2013-05-02 00:22:10 +00:00
Jeff Sharkey
9ecfee03fa Start fleshing out new storage APIs. 
Introduces new DocumentsContract which storage backends must
implement.  Backends surface a simple directory-like organizational
structure that enables a document to appear at multiple locations in
that hierarchy.  Querying a document or the contents of a directory
will return a Cursor populated with DocumentColumns, which includes
simple metadata.

Adds new OPEN_DOC and CREATE_DOC Intents, and permission to protect
storage backends.

Change-Id: Ib4984bc980182b2cedbe552908e5be94604ef085
 2013-05-01 17:21:06 -07:00
Jeff Brown
cefeb29d53 Don't dump sql bindargs unless verbose mode is requested. 
Bug: 8780126
Change-Id: I88e238f9d684cc76731207e75370cbb2e0e476c5
 2013-05-01 15:28:37 -07:00
Elliott Hughes
c3bc1b671e am c255800f: am 6d82f86f: Merge "Show CJK dates as all-numeric in the DatePicker." 
* commit 'c255800fb0f46ea5f68d2c145605ac7dcd3a89b6':
  Show CJK dates as all-numeric in the DatePicker.
 2013-05-01 14:56:59 -07:00
Elliott Hughes
c255800fb0 am 6d82f86f: Merge "Show CJK dates as all-numeric in the DatePicker." 
* commit '6d82f86fa01800ee0523743366e0dc1113178fd9':
  Show CJK dates as all-numeric in the DatePicker.
 2013-05-01 14:53:28 -07:00
Elliott Hughes
949e9df25b Show CJK dates as all-numeric in the DatePicker. 
Before, we'd have something like 2006 4月12. After, we have 2006 4 12.
The alternative would require using custom NumberPicker.Formatter instances
for the year and day fields in these locales, and that seems significantly
more disruptive.

Bug: 8766552
Change-Id: I568578aae2f80f2acfc53cd277ef3beae6743472
 2013-05-01 14:12:05 -07:00
Romain Guy
fa4eb085c3 am b107b7e9: Merge "Prevent TextureView from ever setting a null layer paint Bug #8760436" into jb-mr2-dev 
* commit 'b107b7e9ecaee799a7a18b8ab897969ef554fd9b':
  Prevent TextureView from ever setting a null layer paint Bug #8760436
 2013-04-30 18:16:11 -07:00
Romain Guy
b107b7e9ec Merge "Prevent TextureView from ever setting a null layer paint Bug #8760436" into jb-mr2-dev 2013-05-01 01:14:41 +00:00
Casey Burkhardt
d9ad188a18 am dd7d8ec1: am 203aa72e: Merge "Rebuilds ActionBar accessibility description as needed" into jb-mr2-dev 
* commit 'dd7d8ec17ec1129f33764e025366129d3562ea7e':
  Rebuilds ActionBar accessibility description as needed
 2013-04-30 17:26:14 -07:00
Casey Burkhardt
dd7d8ec17e am 203aa72e: Merge "Rebuilds ActionBar accessibility description as needed" into jb-mr2-dev 
* commit '203aa72e747794a64a8262ceb6c9cdc8381e77cb':
  Rebuilds ActionBar accessibility description as needed
 2013-04-30 17:20:12 -07:00
Casey Burkhardt
203aa72e74 Merge "Rebuilds ActionBar accessibility description as needed" into jb-mr2-dev 2013-05-01 00:15:44 +00:00
Chet Haase
b713a15f09 am 8afd195d: am 6b313da0: Merge "Clarify behavior of fullscreen mode and softInputMode\'s adjustResize" into jb-mr2-dev 
* commit '8afd195d47d2813822a388fbd0ea69228deafcf0':
  Clarify behavior of fullscreen mode and softInputMode's adjustResize
 2013-04-30 16:45:42 -07:00
Chet Haase
8afd195d47 am 6b313da0: Merge "Clarify behavior of fullscreen mode and softInputMode\'s adjustResize" into jb-mr2-dev 
* commit '6b313da0d89564711acfc8c66b7790da0f52d187':
  Clarify behavior of fullscreen mode and softInputMode's adjustResize
 2013-04-30 16:42:33 -07:00
Casey Burkhardt
8452a7f2f6 Rebuilds ActionBar accessibility description as needed 
Previously, ActionBarView only updated the contentDescription for the navigate
up/home affordance when it is enabled or disabled.  This causes that description
to be rebuilt and applied whenever the title or subtitle of the view is changed.
This also inadvertantly removes whitespace in ActionBarView.

Bug: 8757286
Change-Id: I1ea02cad20e0d5c0c57d071727cc647c4dd52d44
 2013-04-30 16:05:56 -07:00
Jeff Sharkey
09aa0cf6f6 Merge "Better --unplugged support when dumping battery." 2013-04-30 22:14:12 +00:00
Alan Viverette
52ae8e845e am a7fa0079: am 561dcc58: Merge "Avoid crash when TextToSpeech calls onInit() from the constructor." into jb-mr2-dev 
* commit 'a7fa0079a7bf544f7f7b0828c00a9247c0c51bfe':
  Avoid crash when TextToSpeech calls onInit() from the constructor.
 2013-04-30 14:09:01 -07:00
Alan Viverette
a7fa0079a7 am 561dcc58: Merge "Avoid crash when TextToSpeech calls onInit() from the constructor." into jb-mr2-dev 
* commit '561dcc5823eec20c48d116531556b32e9de66f91':
  Avoid crash when TextToSpeech calls onInit() from the constructor.
 2013-04-30 14:04:13 -07:00
Jeff Sharkey
ec43a6bc17 Better --unplugged support when dumping battery. 
Also fixes logBatteryStatsLocked() to output valid dump data, instead
of just a usage message.

Bug: 8708665
Change-Id: Ie0d8d90e1a470b7e1e902643333309c2cf7bdb72
 2013-04-30 13:33:18 -07:00
Elliott Hughes
a5e5196bec am 76c643c9: am e3f2735f: Merge "when locale is non-Enligh, sometimes month spinner needs a number IME" 
* commit '76c643c9b600ef31c22f807c2874c879a7fa5069':
  when locale is non-Enligh, sometimes month spinner needs a number IME
 2013-04-30 13:23:17 -07:00
Romain Guy
0520146c41 am 55828af2: am 6628ee7a: Merge "HeaderViewListAdapter: Correct thrown error names." 
* commit '55828af26ce0090c6c80a300d27d1064ce1b74c6':
  HeaderViewListAdapter: Correct thrown error names.
 2013-04-30 13:23:15 -07:00
Elliott Hughes
76c643c9b6 am e3f2735f: Merge "when locale is non-Enligh, sometimes month spinner needs a number IME" 
* commit 'e3f2735fcfd8dafd226200d5cf219a6f82c9cc0c':
  when locale is non-Enligh, sometimes month spinner needs a number IME
 2013-04-30 13:21:22 -07:00
Romain Guy
55828af26c am 6628ee7a: Merge "HeaderViewListAdapter: Correct thrown error names." 
* commit '6628ee7a46a56cdc28d409e6fd74afc34bd24c5b':
  HeaderViewListAdapter: Correct thrown error names.
 2013-04-30 13:21:19 -07:00
Elliott Hughes
e3f2735fcf Merge "when locale is non-Enligh, sometimes month spinner needs a number IME" 2013-04-30 20:11:50 +00:00
Elliott Hughes
31872fd7ce am a99595a3: am afe56810: Merge "Fix DatePicker\'s spinner order in various locales." 
* commit 'a99595a393341b6a130e202bc9e93848ee53057b':
  Fix DatePicker's spinner order in various locales.
 2013-04-30 12:17:27 -07:00
Elliott Hughes
ba8d2e58f8 am c2639e58: am 0bb4c701: Merge "Use ICU for getDateFormatOrder." 
* commit 'c2639e58fa5724c06a1d910ad76aebed647b4ba2':
  Use ICU for getDateFormatOrder.
 2013-04-30 12:17:25 -07:00
Elliott Hughes
a99595a393 am afe56810: Merge "Fix DatePicker\'s spinner order in various locales." 
* commit 'afe56810517a4ddfad125029ca04fd4cc5af2ef5':
  Fix DatePicker's spinner order in various locales.
 2013-04-30 12:15:06 -07:00
Elliott Hughes
c2639e58fa am 0bb4c701: Merge "Use ICU for getDateFormatOrder." 
* commit '0bb4c701bab0f69172417b7a511acb6bdfa052db':
  Use ICU for getDateFormatOrder.
 2013-04-30 12:15:00 -07:00
Romain Guy
6628ee7a46 Merge "HeaderViewListAdapter: Correct thrown error names." 2013-04-30 19:11:22 +00:00
Taylor H. Perkins
62b2bb80f6 HeaderViewListAdapter: Correct thrown error names. 
When accessing an invalid entry of the list, an IndexOutOfBounds exception is thrown, not an ArrayIndexOutOfBounds exception.

Change-Id: I3cf59faab004fa6391d84f30f280e0c9bd92dc44
Signed-off-by: Taylor H. Perkins <taylorhp@gmail.com>
 2013-04-30 12:04:52 -07:00
Romain Guy
4225d79656 Merge "Handle Surface::lock errors in TextureView Bug #8689535" 2013-04-30 18:58:17 +00:00
Elliott Hughes
afe5681051 Merge "Fix DatePicker's spinner order in various locales." 2013-04-30 18:40:01 +00:00
Romain Guy
9e37d590a6 Merge "Fix TextClock documentation Bug #8670351" 2013-04-30 18:31:29 +00:00
Romain Guy
53bacf5a91 Handle Surface::lock errors in TextureView 
Bug #8689535

Change-Id: I6d16e13903a58e93940160e7656147656ab79982
 2013-04-30 11:30:10 -07:00
Elliott Hughes
0bb4c701ba Merge "Use ICU for getDateFormatOrder." 2013-04-30 18:22:18 +00:00
Romain Guy
09b1994c4d Fix TextClock documentation 
Bug #8670351

Change-Id: I87a906b85b51f44d9dcecb6f137db53886323ad7
 2013-04-30 11:19:39 -07:00
Romain Guy
efb709adfe Prevent TextureView from ever setting a null layer paint 
Bug #8760436

DO NOT MERGE

Change-Id: I7e4d09fa534f539cb99ebeaa8159fb11920460cf
 2013-04-30 11:13:00 -07:00
Elliott Hughes
659f145278 Fix DatePicker's spinner order in various locales. 
DatePicker always effectively uses yyyy MMM dd, so we need to ask
icu4c what order those should appear in for the user's locale. The
existing DateFormat code was an approximation that worked for en_US
but not for all languages (fa being one example).

Bug: 7207103
Change-Id: I7b12568dbc02522ebad6e1db5f8426109cd6f7ce
 2013-04-30 11:11:53 -07:00
Elliott Hughes
edd6f9e688 Use ICU for getDateFormatOrder. 
Bug: 7207103
Change-Id: I680bb727cb74cd4b050f237f036d9e696201fc0b
 2013-04-30 11:09:53 -07:00
Romain Guy
f9aca99353 Merge "Prevent TextureView from ever setting a null layer paint" 2013-04-30 17:26:10 +00:00
Romain Guy
c2079c968d Prevent TextureView from ever setting a null layer paint 
Change-Id: If9a418b7eb9969410286df43ee805cd7d8ec17b2
 2013-04-30 10:25:35 -07:00
Kenny Root
178e8bbf25 am e9ae6822: resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp 
* commit 'e9ae6822a80cb1f3bd13c785f1727c03d35da52e':
  Track change to JSSE provider
 2013-04-30 09:01:38 -07:00
John Reck
6a5a04ae66 am be53f180: am 28d91bdb: Merge "Revert "Can not mark the same content of browser page after copy"" 
* commit 'be53f1806cf9f0ec69f785a0063227e0ed795eb8':
  Revert "Can not mark the same content of browser page after copy"
 2013-04-30 09:01:35 -07:00
Zhentao Sun
752625c844 am 460778f1: am 906e57d8: Merge "Fixed race conditions in GeofenceHardwareImpl." into jb-mr2-dev 
* commit '460778f10475bb9fa02cbfe8af7faef38807435c':
  Fixed race conditions in GeofenceHardwareImpl.
 2013-04-30 08:31:46 -07:00
Chet Haase
6b313da0d8 Merge "Clarify behavior of fullscreen mode and softInputMode's adjustResize" into jb-mr2-dev 2013-04-30 14:45:46 +00:00
Kenny Root
e9ae6822a8 resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp 
Change-Id: I06c05d637613215b6d83df3e29cd495f6a5a0176
 2013-04-29 23:09:03 -07:00