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
Zhijun He
922e46ae9a am db2aacfb: am 8f4e289f: Merge "Camera2: Fix focusRange type" into klp-dev 
* commit 'db2aacfb7bff0d31d98bb68a810d55a78505f39a':
  Camera2: Fix focusRange type
 2013-09-26 13:33:20 -07:00
Zhijun He
db2aacfb7b am 8f4e289f: Merge "Camera2: Fix focusRange type" into klp-dev 
* commit '8f4e289f8c1f4743a459b232b9e5ac9d58095139':
  Camera2: Fix focusRange type
 2013-09-26 13:30:23 -07:00
Zhijun He
8f4e289f8c Merge "Camera2: Fix focusRange type" into klp-dev 2013-09-26 20:28:19 +00:00
Christopher Tate
ae269d5727 Sigh. 
Bug 10746233

Change-Id: I18c84f2bd53a511fc86be42b5d72062650e5b289
 2013-09-26 13:23:43 -07:00
Amith Yamasani
fc95e70abd Don't remove restrictions files that are valid 
This fixes a bug in parsing the package name from a file name. The suffix
was not taken into account, resulting in all restrictions files being
removed on switching to a user.

Bug: 10947554
Change-Id: I62725bbbdc0e15609872de3896130d4acbc35386
 2013-09-26 13:20:17 -07:00
John Spurlock
aeec058e6a am a77be202: am 91949b20: Merge "New battery meter view bolt shape + color." into klp-dev 
* commit 'a77be2025e992df2bfec85afca40a546a5154d93':
  New battery meter view bolt shape + color.
 2013-09-26 13:16:02 -07:00
Jeff Sharkey
ee2f7df9ee Tighten flags enforcement, API to test Uris. 
Check and throw if callers request invalid grant flags.  Add API to
test if a Uri is backend by a DocumentsProvider.

Bug: 10919391, 10935608
Change-Id: Ifa6afefb95983558c8c64dc15ddf650e9fe07080
 2013-09-26 13:14:45 -07:00
John Spurlock
a77be2025e am 91949b20: Merge "New battery meter view bolt shape + color." into klp-dev 
* commit '91949b20c9e430eaba8cf2cf21abe403eb298a94':
  New battery meter view bolt shape + color.
 2013-09-26 13:13:00 -07:00
John Spurlock
91949b20c9 Merge "New battery meter view bolt shape + color." into klp-dev 2013-09-26 20:10:20 +00:00
Vineeta Srivastava
91fb7f4e45 am b3bf796f: am aeaecacc: Merge "telephony: Set roam though same named operator" into klp-dev 
* commit 'b3bf796ff27ea41d8d1f5780375508357d24abca':
  telephony: Set roam though same named operator
 2013-09-26 13:04:56 -07:00
Vineeta Srivastava
b3bf796ff2 am aeaecacc: Merge "telephony: Set roam though same named operator" into klp-dev 
* commit 'aeaecacccac2ea9b3db310921707696c56afada4':
  telephony: Set roam though same named operator
 2013-09-26 13:01:53 -07:00
Marco Nelissen
4cce5d76df am 6e14f9bc: am 2c702990: Merge "Fix logic in fallback ringtone handling" into klp-dev 
* commit '6e14f9bc9086edf1112ea5e7f5f010251b65f926':
  Fix logic in fallback ringtone handling
 2013-09-26 13:01:20 -07:00
Vineeta Srivastava
aeaecaccca Merge "telephony: Set roam though same named operator" into klp-dev 2013-09-26 19:59:20 +00:00
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
Scott Main
38622428e0 am 8d097b26: 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 '8d097b2603cd8ea3ee9ffd7930ccb92416cc2ef9':
  update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
 2013-09-26 12:56:39 -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
Sungmin Choi
3cf4dbaba7 telephony: Set roam though same named operator 
Show roaming icon though same named operators.
Though same mcc and same operator name, some operator want to roam.
For example, users of 40485 should see the roaming icon as using 40483
network though same Reliance network.
To do this, add 40483 item to values-mcc404-mnc85/config.xml

Bug: 10699045, 10703022
Change-Id: Ife1024ef10a29e43e32040800b25feca9f51fb62

Conflicts:
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
 2013-09-26 12:53:48 -07:00
Daniel Sandler
8475a74bdd Would you like a dessert? 
Feel free to browse our lovely dessert case. You're sure to
find something to your liking; we have many familiar
favorites, as well as some rather rare and exotic pastries.

Bug: 10240151
Change-Id: I0f423e5993c049409d89b6be304f57a86974f15a
 2013-09-26 15:51:45 -04: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
b9c4f84769 am b78f5bf1: am fc8a982e: am 95fdf3d9: am a37c524f: am 54f8facf: update action bar icon pack with xxhdpi assets bug: 9761668 
* commit 'b78f5bf182837764e1155d0ee6eaa1278128d7d4':
  update action bar icon pack with xxhdpi assets bug: 9761668
 2013-09-26 12:47:34 -07:00
John Spurlock
65a04b0f0b am 2a128013: am e54eb7f9: Merge "Add RTL versions of wimax status bar icons." into klp-dev 
* commit '2a128013ddc3f1824349700d2da3019259672aa5':
  Add RTL versions of wimax status bar icons.
 2013-09-26 12:47:31 -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
Svetoslav Ganov
cb247866ac PackageManager#queryIntentServices breaks its contract. 
PackageManager#queryIntentServices javadoc contract states that this
method (and the like) never returns null, rather an empty list if
no result is found. However, there is a path in the PackageManagerService
that returns null, thus breaking the contract. Handling the null list
explicitly.

bug:10930560

Change-Id: I708c51b8b7075e529145c8b0bf159efd6b697532
 2013-09-26 12:34:49 -07: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
af1066d917 am 4609d9a9: am 5cab967b: Merge "Adding hidden APIs for observing the print jobs state." into klp-dev 
* commit '4609d9a9ebc17d804d31d5241968157439c92a57':
  Adding hidden APIs for observing the print jobs state.
 2013-09-26 12:28:59 -07:00
Svetoslav Ganov
aa14d0e7fd am 1711895e: am 3adc49c6: Merge "Disallow range selection if the document has unknown page count." into klp-dev 
* commit '1711895e7a36956e68dd520109672e34a5baa159':
  Disallow range selection if the document has unknown page count.
 2013-09-26 12:28:56 -07:00
Svetoslav Ganov
7d877d9c58 am d5159505: am c9cfd605: Merge "Missed signal in FusedPrintersLoader." into klp-dev 
* commit 'd5159505638b2ff29de755231cc7139a3daeca4a':
  Missed signal in FusedPrintersLoader.
 2013-09-26 12:25:20 -07:00
Svetoslav Ganov
f2e730589f am c2999acd: am 027ff385: Merge "Page range validation edge case handling." into klp-dev 
* commit 'c2999acd6105e2918285ebf16430e23507a84255':
  Page range validation edge case handling.
 2013-09-26 12:25:16 -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
7abfab466a am f12e49f3: am 1de64c0a: Merge "Fix crash in ApduServiceInfo parsing." into klp-dev 
* commit 'f12e49f32edc39c7aca8d123db6f10b1edfb598e':
  Fix crash in ApduServiceInfo parsing.
 2013-09-26 11:55:48 -07: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