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

113704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Nelissen
6e14f9bc90 am 2c702990: Merge "Fix logic in fallback ringtone handling" into klp-dev 
* commit '2c7029902961772a1531b6502e4fb45a3e6fb76f':
  Fix logic in fallback ringtone handling
 2013-09-26 12:58:04 -07:00
Marco Nelissen
2c70299029 Merge "Fix logic in fallback ringtone handling" into klp-dev 2013-09-26 19:56:13 +00:00
Scott Main
8d097b2603 am 9f54a583: am 6d49f698: am ce57e1a6: am 4c9ed63c: update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon 
* commit '9f54a5834a5dacbf742ae17a63d7e5e290b6ccb3':
  update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
 2013-09-26 12:54:30 -07:00
Scott Main
9f54a5834a am 6d49f698: am ce57e1a6: am 4c9ed63c: update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon 
* commit '6d49f6980bff8c4ec15db169128b439c0b732ac5':
  update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
 2013-09-26 12:51:09 -07:00
Scott Main
6d49f6980b am ce57e1a6: am 4c9ed63c: update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon 
* commit 'ce57e1a6f373c4f1c39b048adc1f2bbe6232be0e':
  update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
 2013-09-26 12:48:04 -07:00
Scott Main
ce57e1a6f3 am 4c9ed63c: update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon 
* commit '4c9ed63cc66c5558e3b0330b17df92e99290eaf7':
  update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
 2013-09-26 12:45:22 -07:00
Marco Nelissen
19a4671b10 Fix logic in fallback ringtone handling 
The existing code would only play a fallback ringtone if the requested
ringtone was one of the three ringtone uris that are defined by settings,
and it wasn't set to "silent".
Now it also plays the fallback for custom ringtone uris.

b/10891718

Change-Id: I79c2298c6497165e6845b98532cce0855347e50b
 2013-09-26 12:44:55 -07:00
Scott Main
b78f5bf182 am fc8a982e: am 95fdf3d9: am a37c524f: am 54f8facf: update action bar icon pack with xxhdpi assets bug: 9761668 
* commit 'fc8a982e55b3d6308a35d8674a192972ecd6f632':
  update action bar icon pack with xxhdpi assets bug: 9761668
 2013-09-26 12:44:26 -07:00
John Spurlock
2a128013dd am e54eb7f9: Merge "Add RTL versions of wimax status bar icons." into klp-dev 
* commit 'e54eb7f9441d279e585b37ca16ce220ed2dcd27c':
  Add RTL versions of wimax status bar icons.
 2013-09-26 12:44:23 -07:00
Scott Main
fc8a982e55 am 95fdf3d9: am a37c524f: am 54f8facf: update action bar icon pack with xxhdpi assets bug: 9761668 
* commit '95fdf3d91fc49956daea8cdaf30f7a578fdbeb8b':
  update action bar icon pack with xxhdpi assets bug: 9761668
 2013-09-26 12:42:26 -07:00
John Spurlock
e54eb7f944 Merge "Add RTL versions of wimax status bar icons." into klp-dev 2013-09-26 19:41:56 +00:00
Scott Main
95fdf3d91f am a37c524f: am 54f8facf: update action bar icon pack with xxhdpi assets bug: 9761668 
* commit 'a37c524ffc4a0387fac79e8ad4ab6319eeb99fa8':
  update action bar icon pack with xxhdpi assets bug: 9761668
 2013-09-26 12:40:29 -07:00
Scott Main
4c9ed63cc6 update the nav drawer lesson to link to new action bar icon pack, 
which now includes the nav drawer icon

Change-Id: I0d6452fa5b4856b96268763141d74dd8f83c221d
 2013-09-26 12:39:27 -07:00
Scott Main
a37c524ffc am 54f8facf: update action bar icon pack with xxhdpi assets bug: 9761668 
* commit '54f8facfc8d103e6dd7211bbabfe36d083798731':
  update action bar icon pack with xxhdpi assets bug: 9761668
 2013-09-26 12:37:44 -07:00
John Spurlock
9e6f69123c Add RTL versions of wimax status bar icons. 
Bug:7968781
Change-Id: I9f03d92f7682416ad4b99ecfb18317842b85163d
 2013-09-26 15:36:31 -04:00
Scott Main
54f8facfc8 update action bar icon pack with xxhdpi assets 
bug: 9761668

Change-Id: Ib76dec4f90052c803c224f6489876644ee2f44ab
 2013-09-26 12:30:30 -07:00
Svetoslav Ganov
4609d9a9eb am 5cab967b: Merge "Adding hidden APIs for observing the print jobs state." into klp-dev 
* commit '5cab967bf2bab49777bfa86dff8b0f892192ede6':
  Adding hidden APIs for observing the print jobs state.
 2013-09-26 12:25:10 -07:00
Svetoslav Ganov
1711895e7a am 3adc49c6: Merge "Disallow range selection if the document has unknown page count." into klp-dev 
* commit '3adc49c6780633b8bccc3b5b8dca10788c2288bc':
  Disallow range selection if the document has unknown page count.
 2013-09-26 12:25:07 -07:00
Svetoslav Ganov
5cab967bf2 Merge "Adding hidden APIs for observing the print jobs state." into klp-dev 2013-09-26 19:22:20 +00:00
Svetoslav Ganov
d515950563 am c9cfd605: Merge "Missed signal in FusedPrintersLoader." into klp-dev 
* commit 'c9cfd605a24cf20df5248d73804c584168db64c9':
  Missed signal in FusedPrintersLoader.
 2013-09-26 12:21:30 -07:00
Svetoslav Ganov
c2999acd61 am 027ff385: Merge "Page range validation edge case handling." into klp-dev 
* commit '027ff3855d257e5179d43a1859bf56530d0f975a':
  Page range validation edge case handling.
 2013-09-26 12:21:27 -07:00
Svetoslav Ganov
3adc49c678 Merge "Disallow range selection if the document has unknown page count." into klp-dev 2013-09-26 19:21:06 +00:00
Svetoslav Ganov
c9cfd605a2 Merge "Missed signal in FusedPrintersLoader." into klp-dev 2013-09-26 19:20:28 +00:00
Svetoslav Ganov
027ff3855d Merge "Page range validation edge case handling." into klp-dev 2013-09-26 19:19:39 +00:00
Martijn Coenen
f12e49f32e am 1de64c0a: Merge "Fix crash in ApduServiceInfo parsing." into klp-dev 
* commit '1de64c0aa55f74f5b2692dcac3b3350dacda4041':
  Fix crash in ApduServiceInfo parsing.
 2013-09-26 11:52:28 -07:00
Martijn Coenen
1de64c0aa5 Merge "Fix crash in ApduServiceInfo parsing." into klp-dev 2013-09-26 18:48:20 +00: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
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
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
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
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
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
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
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
Mindy Pereira
d993cda22a Merge "De-blue notification backgrounds" into klp-dev 2013-09-26 16:47:44 +00:00