drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
115,193 Commits 1 Branch 0 Tags
Commit Graph

115193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
29ddb51b36 am e85fb61c: am ef224156: Merge "Update external storage permission strings." into klp-dev 
* commit 'e85fb61c987f6af0d399c70090008cbb464fb39f':
  Update external storage permission strings.
 2013-09-26 11:22:57 -07:00
Martijn Coenen
eed43391c6 Fix crash in ApduServiceInfo parsing. 
Bug: 10949100
Change-Id: I181734074b071179ea5637a070714643508bc64b
 2013-09-26 11:20:37 -07:00
Jeff Sharkey
e85fb61c98 am ef224156: Merge "Update external storage permission strings." into klp-dev 
* commit 'ef2241563f8b15491fda198b49fe58e0ec316bfe':
  Update external storage permission strings.
 2013-09-26 11:18:42 -07:00
Jeff Sharkey
ef2241563f Merge "Update external storage permission strings." into klp-dev 2013-09-26 18:16:50 +00:00
Adam Koch
83a827dfb1 am 1fde7fbf: am 10fe8573: am f0b67e1f: am cf5a962b: am e405da02: Doc fix: remove insecure sharing suggestions from training class Bug: 10841151 
* commit '1fde7fbf9da29019def0dc097d13b7fb5cf260cb':
  Doc fix: remove insecure sharing suggestions from training class Bug: 10841151
 2013-09-26 11:15:55 -07:00
Adam Koch
1fde7fbf9d am 10fe8573: am f0b67e1f: am cf5a962b: am e405da02: Doc fix: remove insecure sharing suggestions from training class Bug: 10841151 
* commit '10fe85739f8f87fedf474f5f1cc4b0caeece8039':
  Doc fix: remove insecure sharing suggestions from training class Bug: 10841151
 2013-09-26 11:14:02 -07:00
Adam Koch
10fe85739f am f0b67e1f: am cf5a962b: am e405da02: Doc fix: remove insecure sharing suggestions from training class Bug: 10841151 
* commit 'f0b67e1f30a8d2825cc99004c1c9141bb866b719':
  Doc fix: remove insecure sharing suggestions from training class Bug: 10841151
 2013-09-26 11:12:24 -07:00
Adam Koch
f0b67e1f30 am cf5a962b: am e405da02: Doc fix: remove insecure sharing suggestions from training class Bug: 10841151 
* commit 'cf5a962b05aabcdd2c7a25081772af2e7f2a62d5':
  Doc fix: remove insecure sharing suggestions from training class Bug: 10841151
 2013-09-26 11:10:34 -07:00
Adam Koch
cf5a962b05 am e405da02: Doc fix: remove insecure sharing suggestions from training class Bug: 10841151 
* commit 'e405da02208145d2ea8de0759c0f0027d4560840':
  Doc fix: remove insecure sharing suggestions from training class Bug: 10841151
 2013-09-26 11:06:17 -07:00
Jeff Sharkey
8aa0c34483 am cd30bb6c: am bb77d99c: Merge "Directories are always enabled; update assets." into klp-dev 
* commit 'cd30bb6c710d40839bc8b4d6edcb866f13342b5a':
  Directories are always enabled; update assets.
 2013-09-26 11:05:44 -07:00
Jeff Sharkey
6e85d24210 Update external storage permission strings. 
Bug: 10681853
Change-Id: I92ee1a349b1dd5fcd08d1e7cb936a77774d72da6
 2013-09-26 11:01:56 -07:00
Jeff Sharkey
cd30bb6c71 am bb77d99c: Merge "Directories are always enabled; update assets." into klp-dev 
* commit 'bb77d99c257bc4a3371548c4bc8ba7088fa76005':
  Directories are always enabled; update assets.
 2013-09-26 11:00:48 -07:00
Jeff Sharkey
bb77d99c25 Merge "Directories are always enabled; update assets." into klp-dev 2013-09-26 17:58:41 +00:00
Adam Koch
e405da0220 Doc fix: remove insecure sharing suggestions from training class 
Bug: 10841151

Change-Id: I11de149d512340d098a8c23661cd6f6a342718d5
 2013-09-26 17:54:46 +00:00
Jeff Sharkey
2a030b05a9 Directories are always enabled; update assets. 
Fix bug where item enabled state depended on FLAG_SUPPORTS_WRITE;
directories are now always enabled.  Also unifies enabled testing.

Bug: 10903210, 10946731
Change-Id: I241533d273dfe4a2146bb322a8bd93066bf4ef55
 2013-09-26 10:54:19 -07:00
Zhijun He
c59b078acb Camera2: Fix focusRange type 
It should be a pair of floats.

Bug: 10360518
Change-Id: Ic0aee6c08eee385ecbf634bafc769e08dc199c1f
 2013-09-26 10:39:36 -07:00
Adam Lesinski
9c437bcb57 am 7979e170: am bde988ad: Merge "Add Graphics alloc tracking via memtrack" into klp-dev 
* commit '7979e170b5bdfb6922d758f2c66f06829b6b5d9b':
  Add Graphics alloc tracking via memtrack
 2013-09-26 10:31:27 -07:00
Adam Lesinski
7979e170b5 am bde988ad: Merge "Add Graphics alloc tracking via memtrack" into klp-dev 
* commit 'bde988ade5f75c3d241422dce2ee4124871fab53':
  Add Graphics alloc tracking via memtrack
 2013-09-26 10:27:55 -07:00
Winson Chung
3948e45d6e am 5161b018: am 8fe3097c: Merge "Add QuickSettings all-caps override for certain locales. (Bug 10518893)" into klp-dev 
* commit '5161b01893d372e1141e781a219391074a2ee1cb':
  Add QuickSettings all-caps override for certain locales. (Bug 10518893)
 2013-09-26 10:24:13 -07:00
Adam Lesinski
bde988ade5 Merge "Add Graphics alloc tracking via memtrack" into klp-dev 2013-09-26 17:22:31 +00:00
Winson Chung
5161b01893 am 8fe3097c: Merge "Add QuickSettings all-caps override for certain locales. (Bug 10518893)" into klp-dev 
* commit '8fe3097c87fad3bec6fd53606fe8ff7076bef173':
  Add QuickSettings all-caps override for certain locales. (Bug 10518893)
 2013-09-26 10:20:49 -07:00
Winson Chung
8fe3097c87 Merge "Add QuickSettings all-caps override for certain locales. (Bug 10518893)" into klp-dev 2013-09-26 17:17:18 +00:00
Zhijun He
fd128ff0d6 am b208861e: am aea8ec1a: Merge "Camera2: Fix Camera integration test deadlock" into klp-dev 
* commit 'b208861ef74442ff888e1aaed61b95077364d685':
  Camera2: Fix Camera integration test deadlock
 2013-09-26 10:12:09 -07:00
Zhijun He
b208861ef7 am aea8ec1a: Merge "Camera2: Fix Camera integration test deadlock" into klp-dev 
* commit 'aea8ec1a73ddf594cb295459916ab5b77820f061':
  Camera2: Fix Camera integration test deadlock
 2013-09-26 10:09:28 -07:00
Zhijun He
aea8ec1a73 Merge "Camera2: Fix Camera integration test deadlock" into klp-dev 2013-09-26 17:06:49 +00:00
Daniel Sandler
ecaeabe33a am d90db953: am 87c6d876: Merge "Updated quick settings assets." into klp-dev 
* commit 'd90db9534c52c77f7ceaabcd5607ec4138b3a39c':
  Updated quick settings assets.
 2013-09-26 09:56:58 -07:00
Daniel Sandler
d90db9534c am 87c6d876: Merge "Updated quick settings assets." into klp-dev 
* commit '87c6d8766ea3e591adc270cefc1976b46768bce2':
  Updated quick settings assets.
 2013-09-26 09:54:16 -07:00
Mindy Pereira
cf0bb77861 am cc81ed0f: am b198115e: Merge "De-blue the add lock screen widget pressed state" into klp-dev 
* commit 'cc81ed0f51cfa5580a8d457e8915adc8bf98a776':
  De-blue the add lock screen widget pressed state
 2013-09-26 09:53:23 -07:00
Mindy Pereira
c9b3c0802d am cde76858: am d993cda2: Merge "De-blue notification backgrounds" into klp-dev 
* commit 'cde768582cef5091807718dde298ad1a587106ea':
  De-blue notification backgrounds
 2013-09-26 09:53:20 -07:00
Daniel Sandler
87c6d8766e Merge "Updated quick settings assets." into klp-dev 2013-09-26 16:51:22 +00:00
Mindy Pereira
cc81ed0f51 am b198115e: Merge "De-blue the add lock screen widget pressed state" into klp-dev 
* commit 'b198115e492c390537ec400caa96baab1ccec5b9':
  De-blue the add lock screen widget pressed state
 2013-09-26 09:50:46 -07:00
Mindy Pereira
cde768582c am d993cda2: Merge "De-blue notification backgrounds" into klp-dev 
* commit 'd993cda22ab9062d4badeeeb12ec7ddf38a16be9':
  De-blue notification backgrounds
 2013-09-26 09:50:43 -07:00
Mindy Pereira
b198115e49 Merge "De-blue the add lock screen widget pressed state" into klp-dev 2013-09-26 16:47:59 +00:00
Dianne Hackborn
f17b69e58b am 63cff11b: am c222f57b: Merge "Fix issue #10919261: Don\'t clear OP_WRITE_SMS when resetting app prefs" into klp-dev 
* commit '63cff11b8aa42efe849c84b8fc74be7c2f354075':
  Fix issue #10919261: Don't clear OP_WRITE_SMS when resetting app prefs
 2013-09-26 09:47:44 -07:00
Mindy Pereira
d993cda22a Merge "De-blue notification backgrounds" into klp-dev 2013-09-26 16:47:44 +00:00
Dianne Hackborn
63cff11b8a am c222f57b: Merge "Fix issue #10919261: Don\'t clear OP_WRITE_SMS when resetting app prefs" into klp-dev 
* commit 'c222f57b5c992fb661b7112a7cd5e5dbe1c6030c':
  Fix issue #10919261: Don't clear OP_WRITE_SMS when resetting app prefs
 2013-09-26 09:45:10 -07:00
Dianne Hackborn
c222f57b5c Merge "Fix issue #10919261: Don't clear OP_WRITE_SMS when resetting app prefs" into klp-dev 2013-09-26 16:41:14 +00:00
Dianne Hackborn
8828d3a153 Fix issue #10919261: Don't clear OP_WRITE_SMS when resetting app prefs 
Add a new array indicating whether each op allows itself to
be reset, and use it.

Change-Id: I494f630bda170e061196a380563512e9e77b51a8
 2013-09-26 09:40:19 -07:00
Svetoslav Ganov
953c4143e8 Missed signal in FusedPrintersLoader. 
1. In the FusedPrintersLoader we start observing the printers on
   the device and if they change we send the result. If however,
   the printers are already loaded in our session (because it
   joined an ongoing printer discovery) and the pritners do not
   change, the loader never sends its result. Now we are registring
   the callback only after historical printers are loaded. We
   also immediately check after starting discovery whether the
   there are printers in the discovery session and if so deliver
   them.

2. Improved logging in the FusedPrintersLoader.

bug:10940712

Change-Id: Ieb9b897d64780742125b29309462dea3eda170a6
 2013-09-26 08:14:27 -07:00
Svetoslav Ganov
ab051baea5 Page range validation edge case handling. 
The regular expression for validating range input was missing a
coupe of edge cases.

bug:10906805

Change-Id: Ie793588ecb6697aff3d8d85124a8faeda58c69e5
 2013-09-26 00:35:04 -07:00
Jean Chalard
4510eb4049 Fix conflicting/unclear documentation in InputConnection. 
Bug: 10247660
Change-Id: I88f36a3764d5e6dee4e864cb9f6df713dde5e0f5
 2013-09-26 15:47:29 +09:00
Mindy Pereira
4faf288254 De-blue the add lock screen widget pressed state 
Change-Id: Ie823a20be0a6f78e11cfdc2b2458351957aaec70
 2013-09-25 20:35:47 -07:00
Ari Sachter-Zeltzer
02b0e87077 am 57fc59ec: am c31f1188: Merge "deblue btn_cab_done_pressed_holo_*" into klp-dev 
* commit '57fc59ecc2ce59bbda5521284123f6ae8838f3b7':
  deblue btn_cab_done_pressed_holo_*
 2013-09-25 20:20:28 -07:00
Ari Sachter-Zeltzer
57fc59ecc2 am c31f1188: Merge "deblue btn_cab_done_pressed_holo_*" into klp-dev 
* commit 'c31f118825778cff15a1c1b9d1171f2ad178a013':
  deblue btn_cab_done_pressed_holo_*
 2013-09-25 20:18:34 -07:00
Ari Sachter-Zeltzer
c31f118825 Merge "deblue btn_cab_done_pressed_holo_*" into klp-dev 2013-09-26 03:16:24 +00:00
Baligh Uddin
9f68b13fcb am 736c7f44: (-s ours) am 1ffe09e2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '736c7f44b1bb0d4e27d65ddc9d514a4b43b840cb':
  Import translations. DO NOT MERGE
 2013-09-25 19:59:28 -07:00
Baligh Uddin
d05612d375 am d90bf6de: (-s ours) am bed6522a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'd90bf6de29a12d681d75988b71f78c4c1d948a8b':
  Import translations. DO NOT MERGE
 2013-09-25 19:59:24 -07:00
Baligh Uddin
736c7f44b1 am 1ffe09e2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '1ffe09e2f1db4c5e4b89c19be8b810721c9dc212':
  Import translations. DO NOT MERGE
 2013-09-25 19:56:31 -07:00
Baligh Uddin
d90bf6de29 am bed6522a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'bed6522a69dedf4f33568efb48a7b277a70fb35a':
  Import translations. DO NOT MERGE
 2013-09-25 19:56:28 -07:00
Baligh Uddin
e1242178f9 Merge "Import translations. DO NOT MERGE" 2013-09-26 02:55:22 +00:00