Commit Graph

12312 Commits

Author SHA1 Message Date
Edward Jee
5fb79db91b am 1146695e: am 5ad8bf07: Merge "Once the user allows PBAP phonebook access, do not ask again." into klp-dev
* commit '1146695e4b94dd3ea987f942ed8fd86d39a859ce':
  Once the user allows PBAP phonebook access, do not ask again.
2013-09-24 15:29:37 -07:00
Edward Jee
1146695e4b am 5ad8bf07: Merge "Once the user allows PBAP phonebook access, do not ask again." into klp-dev
* commit '5ad8bf0700cf3297773617e14456d82bbc8f9585':
  Once the user allows PBAP phonebook access, do not ask again.
2013-09-24 15:26:23 -07:00
Edward Jee
5ad8bf0700 Merge "Once the user allows PBAP phonebook access, do not ask again." into klp-dev 2013-09-24 22:23:26 +00:00
Amith Yamasani
7c84c7f422 am 7dcd20f9: resolved conflicts for merge of 162b014c to klp-dev-plus-aosp
* commit '7dcd20f9a6877342a92d0e42c1692a25429960f5':
  Add Jakarta timezone
2013-09-24 15:05:02 -07:00
Amith Yamasani
7dcd20f9a6 resolved conflicts for merge of 162b014c to klp-dev-plus-aosp
Change-Id: I46175a9fa7775e7b53a5c4e149c7fd6247c5de9b
2013-09-24 14:59:11 -07:00
Amith Yamasani
162b014cea Merge "Add Jakarta timezone" into klp-dev 2013-09-24 21:49:54 +00:00
Baligh Uddin
2a9ea16846 am 786f7eca: (-s ours) am 0865ffb3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '786f7eca41edbb4cca7b47b0937049751b345913':
  Import translations. DO NOT MERGE
2013-09-24 14:35:21 -07:00
Baligh Uddin
786f7eca41 am 0865ffb3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '0865ffb32d84cdd26bf5136d496b129efbdfc4f1':
  Import translations. DO NOT MERGE
2013-09-24 14:30:17 -07:00
Baligh Uddin
82b2d313db Merge "Import translations. DO NOT MERGE" 2013-09-24 21:27:56 +00:00
Baligh Uddin
0865ffb32d Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-24 21:27:51 +00:00
Christopher Tate
22781873ee am c268bf37: am 254975aa: Merge "Use a generic icon for Home" into klp-dev
* commit 'c268bf379b3da1f29507f75fe8c9115b63acb3a8':
  Use a generic icon for Home
2013-09-24 11:48:30 -07:00
Christopher Tate
c268bf379b am 254975aa: Merge "Use a generic icon for Home" into klp-dev
* commit '254975aac1e42997c2e068a623e7221470525ee1':
  Use a generic icon for Home
2013-09-24 11:46:11 -07:00
Christopher Tate
254975aac1 Merge "Use a generic icon for Home" into klp-dev 2013-09-24 18:44:14 +00:00
David Christie
fd12473145 am 820816e0: am 4fff3d9b: Merge "Don\'t show background apps in Settings->Location (b/10806272)" into klp-dev
* commit '820816e02c6ff68eff5ae565410497e248f6cce3':
  Don't show background apps in Settings->Location (b/10806272)
2013-09-24 10:24:54 -07:00
Dianne Hackborn
718f4d9734 am 6be9bffa: am 88cf7709: Implement issue #10895990: Better durations for proc stats
* commit '6be9bffa6fb5ff3def3ed38dae61dc19f88c0185':
  Implement issue #10895990: Better durations for proc stats
2013-09-24 10:24:53 -07:00
The Android Automerger
3bc0c035e4 merge in klp-release history after reset to klp-dev 2013-09-24 06:01:54 -07:00
Matthew Xie
500f2941a0 Add Bluetooth Privileged permission to use pairing apis
bug 9987787

Change-Id: I8d3b29c36a39ed00618b0ab7ef4f2a4ae14c4116
2013-09-24 01:13:05 -07:00
David Christie
820816e02c am 4fff3d9b: Merge "Don\'t show background apps in Settings->Location (b/10806272)" into klp-dev
* commit '4fff3d9b9d3677383fe1eef9c067058a92fdc5b7':
  Don't show background apps in Settings->Location (b/10806272)
2013-09-23 19:00:49 -07:00
Dianne Hackborn
6be9bffa6f am 88cf7709: Implement issue #10895990: Better durations for proc stats
* commit '88cf7709cb7ed829980cb8ddac3d5c7ac945d772':
  Implement issue #10895990: Better durations for proc stats
2013-09-23 19:00:12 -07:00
Jeff Sharkey
d572a03ad8 Use a generic icon for Home
It's only a *foolish* consistency that is the hobgoblin of
little minds.

Bug 10849877

Change-Id: Ice60cbb13a754edc104ae8630cb3d8dfe637d1af
2013-09-23 17:48:37 -07:00
David Christie
4fff3d9b9d Merge "Don't show background apps in Settings->Location (b/10806272)" into klp-dev 2013-09-24 00:18:39 +00:00
Sungmin Choi
d3b9dc6356 Add Jakarta timezone
Bug: 10198358
Change-Id: Id35bf1f3e137587016649815d879052d9f8409d9
2013-09-23 16:10:03 -07:00
David Christie
b1e381be21 Don't show background apps in Settings->Location (b/10806272)
Change-Id: I7ed0249bbc4509e4116dfc88181faccde60365e1
2013-09-23 15:52:24 -07:00
Edward Jee
46c746551f Once the user allows PBAP phonebook access, do not ask again.
Bug: 9876209
Change-Id: I8d9dcfa03e8d85577af4c4664fa34b3830e3d8f6
2013-09-23 15:21:27 -07:00
Dianne Hackborn
88cf7709cb Implement issue #10895990: Better durations for proc stats
Add new option to select data duration to show, with the default
being 3 hours.

Reworked how menus are updated to remove redundant code.

Switch to using new proc stats service API for retrieving stats,
which is more efficient and won't hit IPC limits.

Fixed layout for details items to ellipsize long items.

Change-Id: I1a0f8a4adf8fc330c2639077323c6379d23ad987
2013-09-23 15:02:13 -07:00
Baligh Uddin
cb5fe9ae53 Import translations. DO NOT MERGE
Change-Id: I0ebdd301a5b6e045641e3671ee8018d74a914185
Auto-generated-cl: translation import
2013-09-23 13:48:26 -07:00
Baligh Uddin
d026526176 Import translations. DO NOT MERGE
Change-Id: I82e5be54e4bfd32b13af0cc450c9b3e7f2e66baa
Auto-generated-cl: translation import
2013-09-23 13:43:27 -07:00
The Android Automerger
afd7782aa1 merge in klp-release history after reset to klp-dev 2013-09-22 10:51:42 -07:00
David Christie
2287f5018c am 13323378: am 1efb1b52: Merge "Remove "Android System" from recent apps list in Settings (b/10855277)" into klp-dev
* commit '133233780bac331d72bc6d40955ba65da9911541':
  Remove "Android System" from recent apps list in Settings (b/10855277)
2013-09-21 11:08:09 -07:00
David Christie
133233780b am 1efb1b52: Merge "Remove "Android System" from recent apps list in Settings (b/10855277)" into klp-dev
* commit '1efb1b52d6901ca58104030e3b98512473bed7fb':
  Remove "Android System" from recent apps list in Settings (b/10855277)
2013-09-21 09:35:41 -07:00
David Christie
1efb1b52d6 Merge "Remove "Android System" from recent apps list in Settings (b/10855277)" into klp-dev 2013-09-21 16:33:51 +00:00
Svetoslav
01e84b4b99 am a771964f: am 995e69d1: Merge "Offer to enable a print service after it is installed (Settings)." into klp-dev
* commit 'a771964fe63cfd3d4b8937f320e41f30461c5f57':
  Offer to enable a print service after it is installed (Settings).
2013-09-20 18:20:26 -07:00
Svetoslav
a771964fe6 am 995e69d1: Merge "Offer to enable a print service after it is installed (Settings)." into klp-dev
* commit '995e69d1e130d54b371e4278e90d508e025de9a2':
  Offer to enable a print service after it is installed (Settings).
2013-09-20 18:18:32 -07:00
Svetoslav
995e69d1e1 Merge "Offer to enable a print service after it is installed (Settings)." into klp-dev 2013-09-21 01:15:52 +00:00
David Christie
bec860d6c4 Remove "Android System" from recent apps list in Settings (b/10855277)
Change-Id: I22d74c22c482786298af088abb7b25c790fd4b21
2013-09-20 18:08:54 -07:00
Svetoslav
0ad40283bb Offer to enable a print service after it is installed (Settings).
The user has to explicitly enable a print service from the settings UI
before using it. Usually, users very rarely if at all interact with print
services, therefore all print service management task are performed from
the print settings. We also have to get user consent warning that the
user's data is about to be given to a third-party app. We now post a
notification allowing the user to go directly to the settings screen to
turn the service on.

bug:10447510

Change-Id: Ibfb5368a09b1e012dd6dd0f3d33a5ad10e5ee00e
2013-09-20 17:34:34 -07:00
Lifu Tang
ef197214df am 1950047a: am c9ebf9bb: Merge "Change "Device sensors only" to "Device sensors"" into klp-dev
* commit '1950047a32fcc3ebcec8adad81770cfd3060716b':
  Change "Device sensors only" to "Device sensors"
2013-09-20 17:14:28 -07:00
Lifu Tang
1950047a32 am c9ebf9bb: Merge "Change "Device sensors only" to "Device sensors"" into klp-dev
* commit 'c9ebf9bbad2eec84a68799a71a229d3198b49c73':
  Change "Device sensors only" to "Device sensors"
2013-09-20 17:12:11 -07:00
Lifu Tang
c9ebf9bbad Merge "Change "Device sensors only" to "Device sensors"" into klp-dev 2013-09-21 00:10:11 +00:00
Lifu Tang
db4ee54975 Change "Device sensors only" to "Device sensors"
- Fix b/10856635

Change-Id: I52ef1daacc205c50056fcead0e6b07c8674275f0
2013-09-20 16:57:18 -07:00
David Braun
785a194893 am 41b18f71: am 1a2bfad4: Merge "Fix crash rotating with default SMS dialog up." into klp-dev
* commit '41b18f71b20de45b3bf195bce3e7b0c85a1db124':
  Fix crash rotating with default SMS dialog up.
2013-09-20 16:33:56 -07:00
David Braun
41b18f71b2 am 1a2bfad4: Merge "Fix crash rotating with default SMS dialog up." into klp-dev
* commit '1a2bfad4250cb231d60823affbb8288b6c6d1797':
  Fix crash rotating with default SMS dialog up.
2013-09-20 16:31:23 -07:00
David Braun
1a2bfad425 Merge "Fix crash rotating with default SMS dialog up." into klp-dev 2013-09-20 23:29:41 +00:00
David Braun
be1f0a111e Fix crash rotating with default SMS dialog up.
Bug: 10845396 NPE storage == null when user rotates device while setting up 'Default SMS app'
Change-Id: I9a19ede726caabe5e66b83951585380768b66be6
2013-09-20 14:15:32 -07:00
Elliott Hughes
392fba359f am b3bc9337: am aeb1fa77: am 10fdcab4: Merge "Fix time zone formatting in RTL locales."
* commit 'b3bc9337161f13ac4a368f7acae50fe1c51af9af':
  Fix time zone formatting in RTL locales.
2013-09-20 13:51:04 -07:00
Elliott Hughes
b3bc933716 am aeb1fa77: am 10fdcab4: Merge "Fix time zone formatting in RTL locales."
* commit 'aeb1fa779ba781fc1decb68db387ee64df58befa':
  Fix time zone formatting in RTL locales.
2013-09-20 13:47:58 -07:00
Elliott Hughes
aeb1fa779b am 10fdcab4: Merge "Fix time zone formatting in RTL locales."
* commit '10fdcab4245ce1beeb75c36b36ccaa48bf8953f0':
  Fix time zone formatting in RTL locales.
2013-09-20 13:46:04 -07:00
Elliott Hughes
10fdcab424 Merge "Fix time zone formatting in RTL locales." 2013-09-20 20:44:32 +00:00
Jim Miller
b5201ad20a am 2b130d78: am de105da5: Merge "Change string documentation for widget setting to be more clear." into klp-dev
* commit '2b130d786deb961c113b97dae136e0f8e6b47a8c':
  Change string documentation for widget setting to be more clear.
2013-09-20 13:10:07 -07:00
Jim Miller
2b130d786d am de105da5: Merge "Change string documentation for widget setting to be more clear." into klp-dev
* commit 'de105da5500477d216d226cc342811e335f8bcb4':
  Change string documentation for widget setting to be more clear.
2013-09-20 13:06:38 -07:00