OSDN Git Service
Amith Yamasani [Thu, 12 Sep 2013 16:49:54 +0000 (09:49 -0700)]
am
ad541608: am
ad0f0edb: Merge "Call to equals() comparing different types"
* commit '
ad54160844177515dfe9024521669e4b47311d0f':
Call to equals() comparing different types
Amith Yamasani [Thu, 12 Sep 2013 16:21:53 +0000 (09:21 -0700)]
am
ad0f0edb: Merge "Call to equals() comparing different types"
* commit '
ad0f0edb54fd61048b64053d7eb8fafa6c84b119':
Call to equals() comparing different types
Baligh Uddin [Thu, 12 Sep 2013 16:12:46 +0000 (09:12 -0700)]
am
1ab0933a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
1ab0933a6dbc4cb3df16b90bc730509ed4162721':
Import translations. DO NOT MERGE
Amith Yamasani [Thu, 12 Sep 2013 16:08:20 +0000 (16:08 +0000)]
Merge "Call to equals() comparing different types"
Baligh Uddin [Thu, 12 Sep 2013 03:13:57 +0000 (03:13 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 11 Sep 2013 22:33:39 +0000 (15:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1cb0e4fdcb057eccc90535d148a38f4149e88419
Auto-generated-cl: translation import
Amith Yamasani [Wed, 11 Sep 2013 17:58:27 +0000 (10:58 -0700)]
am
6cd9a67a: Merge "Increase string lengths for localization." into klp-dev
* commit '
6cd9a67a5463ef97044fa1919b6317276eb8af5f':
Increase string lengths for localization.
Amith Yamasani [Wed, 11 Sep 2013 17:54:53 +0000 (17:54 +0000)]
Merge "Increase string lengths for localization." into klp-dev
Martijn Coenen [Wed, 11 Sep 2013 17:54:52 +0000 (10:54 -0700)]
am
52df3343: Merge "HCE: Latest UX and strings." into klp-dev
* commit '
52df3343ab471b9fcc8773ea7bcb88edb2523896':
HCE: Latest UX and strings.
Martijn Coenen [Wed, 11 Sep 2013 17:52:35 +0000 (17:52 +0000)]
Merge "HCE: Latest UX and strings." into klp-dev
Amith Yamasani [Fri, 6 Sep 2013 00:27:52 +0000 (17:27 -0700)]
Increase string lengths for localization.
Bug:
10287242
Bug:
10282460
Change-Id: Idf867cde3d22446f1a1ce3d4aacbf1d1607a5eb7
Amith Yamasani [Wed, 11 Sep 2013 17:06:28 +0000 (10:06 -0700)]
am
37922a16: Merge "Fix profile picture picking for restricted profiles" into klp-dev
* commit '
37922a16d35526b0a118484c91ce6f8f58c45ce1':
Fix profile picture picking for restricted profiles
Amith Yamasani [Wed, 11 Sep 2013 17:03:54 +0000 (17:03 +0000)]
Merge "Fix profile picture picking for restricted profiles" into klp-dev
Martijn Coenen [Fri, 6 Sep 2013 04:07:23 +0000 (21:07 -0700)]
HCE: Latest UX and strings.
Bug:
10262585
Change-Id: I5473c4d387fed884faf77c7448fab1332f710557
Amith Yamasani [Mon, 9 Sep 2013 20:07:27 +0000 (13:07 -0700)]
Fix profile picture picking for restricted profiles
Due to the new file picker UI and incorrect assumptions of access to sd card,
have to use content provider Uris instead of file paths.
Also makes the cropping robust in the event of not having a cropping intent
on the platform.
This should make the code play well with third party image
and camera apps as well.
Bug:
10666584
Change-Id: Ie8d834fe7aac96bc14829a7be084512a15ef4001
David Braun [Tue, 10 Sep 2013 20:35:43 +0000 (13:35 -0700)]
am
e9aa0a94: Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev
* commit '
e9aa0a94d0572101dd580bcc48e23b96e6c6cb71':
Factor out read/write SMS settings seperate from send/receive.
David Braun [Tue, 10 Sep 2013 20:33:41 +0000 (20:33 +0000)]
Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev
David Braun [Tue, 10 Sep 2013 20:14:09 +0000 (13:14 -0700)]
Factor out read/write SMS settings seperate from send/receive.
Change-Id: I88177c23d165df6c00a8d32203f3a5b18aca1dcf
Przemyslaw Szczepaniak [Tue, 10 Sep 2013 10:19:12 +0000 (03:19 -0700)]
am
eb306b4c: Fix for empty "Listen to an example" string.
* commit '
eb306b4c15d721c69255f02497d2bcebff0c265f':
Fix for empty "Listen to an example" string.
Przemyslaw Szczepaniak [Tue, 10 Sep 2013 09:35:57 +0000 (10:35 +0100)]
Fix for empty "Listen to an example" string.
Because of bug in previous TTS related change (bugfix for hiding
"Play TTS sample" if default language is not supported), settings
stopped to call getSampleText() when it was established that current
default language is supported.
This change makes sure that getSampleText() is always called if language
is supported.
Bug:
10672535
Change-Id: I83bf7056e12ddbe2322b6a3f04552802037626aa
Baligh Uddin [Tue, 10 Sep 2013 05:13:17 +0000 (22:13 -0700)]
am
c184ed76: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c184ed7683f3d56ca545ac91c15c747f5460addc':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 10 Sep 2013 05:08:59 +0000 (05:08 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Jeff Sharkey [Tue, 10 Sep 2013 04:46:19 +0000 (21:46 -0700)]
am
75c4204e: Merge "Remove sdcard developer option, avoid data crash." into klp-dev
* commit '
75c4204e8ab154d860824abfec965a8c62f10d77':
Remove sdcard developer option, avoid data crash.
Jeff Sharkey [Tue, 10 Sep 2013 04:41:18 +0000 (04:41 +0000)]
Merge "Remove sdcard developer option, avoid data crash." into klp-dev
Jeff Sharkey [Tue, 10 Sep 2013 01:42:33 +0000 (18:42 -0700)]
Remove sdcard developer option, avoid data crash.
Remove READ_EXTERNAL_STORAGE enforcement UI, since the permission is
now always enforced. Check to see if bandwidth module is enabled
when launching data usage, and finish gracefully if disabled.
Bug:
10116515,
10392597
Change-Id: Id0295c405b780a53867934b3bcd0a5f56db7d87a
Russell Brenner [Tue, 10 Sep 2013 01:15:57 +0000 (18:15 -0700)]
am
ac72a3df: Merge "Limit wifi password to ascii chars" into klp-dev
* commit '
ac72a3dfd3069c39e3605a9f5f114efb19059ded':
Limit wifi password to ascii chars
Russell Brenner [Tue, 10 Sep 2013 01:11:42 +0000 (01:11 +0000)]
Merge "Limit wifi password to ascii chars" into klp-dev
Amith Yamasani [Mon, 9 Sep 2013 21:25:26 +0000 (14:25 -0700)]
am
329e5b15: Merge "Fix NPE for stability tests" into klp-dev
* commit '
329e5b159a559791c41fbf401cf1af5063caf1cf':
Fix NPE for stability tests
Dianne Hackborn [Mon, 9 Sep 2013 21:25:12 +0000 (14:25 -0700)]
am
d90ff677: Merge "Follow-on for #
10671878: Proc stats needs to remove old data structures" into klp-dev
* commit '
d90ff6772b9b21e6c2e6a0bfa616bd612c6bc849':
Follow-on for #
10671878: Proc stats needs to remove old data structures
Tom O'Neill [Mon, 9 Sep 2013 21:25:11 +0000 (14:25 -0700)]
am
b23c86dd: Merge "Specify user when starting service" into klp-dev
* commit '
b23c86dd2ec48387f099749673df75cc332761e5':
Specify user when starting service
Amith Yamasani [Mon, 9 Sep 2013 21:19:02 +0000 (21:19 +0000)]
Merge "Fix NPE for stability tests" into klp-dev
Dianne Hackborn [Mon, 9 Sep 2013 20:37:25 +0000 (20:37 +0000)]
Merge "Follow-on for #
10671878: Proc stats needs to remove old data structures" into klp-dev
Baligh Uddin [Mon, 9 Sep 2013 20:27:39 +0000 (13:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I69705cf113c1288bad878c5b06b5519df8df92d6
Auto-generated-cl: translation import
Amith Yamasani [Mon, 9 Sep 2013 20:16:00 +0000 (13:16 -0700)]
Fix NPE for stability tests
Bug:
9882651
Change-Id: I4164764a058d68d448ef4a4aba2a18f072079b9c
Tom O'Neill [Mon, 9 Sep 2013 20:04:27 +0000 (20:04 +0000)]
Merge "Specify user when starting service" into klp-dev
Lifu Tang [Mon, 9 Sep 2013 17:44:41 +0000 (10:44 -0700)]
am
d1253a2b: Merge "Revert "Dim icons when recent apps category is disabled"" into klp-dev
* commit '
d1253a2b435c17513a397eee3350f737df7a1d8f':
Revert "Dim icons when recent apps category is disabled"
Lifu Tang [Mon, 9 Sep 2013 17:40:24 +0000 (17:40 +0000)]
Merge "Revert "Dim icons when recent apps category is disabled"" into klp-dev
Tom O'Neill [Mon, 9 Sep 2013 17:33:52 +0000 (10:33 -0700)]
Specify user when starting service
- Improve logging
- Fix b/
10621831
Change-Id: Icbb265ce53640dcf63f1c81d682f5811f196efcc
Russell Brenner [Mon, 9 Sep 2013 17:13:47 +0000 (10:13 -0700)]
Limit wifi password to ascii chars
Bug:
10441448
Change-Id: I7a77a8f594dbe0ef4df60db9b26167b8f17bf8b2
Dianne Hackborn [Mon, 9 Sep 2013 16:51:34 +0000 (09:51 -0700)]
Follow-on for #
10671878: Proc stats needs to remove old data structures
The UI can now show better information about services, now that we
have the name of the process each service runs in and its total run
time.
Change-Id: I0777d8295a50c8f69c57bad24ccafe3bf0fbe5b8
Lifu Tang [Mon, 9 Sep 2013 00:06:34 +0000 (00:06 +0000)]
Revert "Dim icons when recent apps category is disabled"
This change makes all the icons in the system dimmed, not only on Location Settings page. I haven't managed to find a simple fix to that problem. I think we should abandon this feature, and revert this CL.
This reverts commit
ebcd196a0ba404736288d8e6a35dd533f4ee806b.
Change-Id: If39f2892c82643b936d2d9ff7b1d1c027018f3f6
Lifu Tang [Sun, 8 Sep 2013 05:14:11 +0000 (22:14 -0700)]
am
5999658e: Merge "Dim icons when recent apps category is disabled" into klp-dev
* commit '
5999658ef8e5ae0e1e148cca8ab8ab90813902ba':
Dim icons when recent apps category is disabled
Lifu Tang [Sun, 8 Sep 2013 05:12:00 +0000 (05:12 +0000)]
Merge "Dim icons when recent apps category is disabled" into klp-dev
Svetoslav Ganov [Sat, 7 Sep 2013 22:10:35 +0000 (15:10 -0700)]
am
1e1d5324: Merge "Print service settings polish" into klp-dev
* commit '
1e1d532491ecf10e7fd5791559b5d97be5553ae4':
Print service settings polish
Svetoslav Ganov [Sat, 7 Sep 2013 22:05:38 +0000 (22:05 +0000)]
Merge "Print service settings polish" into klp-dev
Lifu Tang [Sat, 7 Sep 2013 03:19:33 +0000 (20:19 -0700)]
Dim icons when recent apps category is disabled
- Fix b/
10654646
Change-Id: I7581054b0838c801cf9a6c889e8aeb9db8c7ba56
Lifu Tang [Sat, 7 Sep 2013 01:35:35 +0000 (18:35 -0700)]
am
066d04de: Merge "Gray recent apps section when location disabled" into klp-dev
* commit '
066d04def1325b97e90f1aaff77e532bf299d938':
Gray recent apps section when location disabled
Lifu Tang [Sat, 7 Sep 2013 01:32:48 +0000 (01:32 +0000)]
Merge "Gray recent apps section when location disabled" into klp-dev
Lifu Tang [Sat, 7 Sep 2013 01:26:21 +0000 (18:26 -0700)]
Gray recent apps section when location disabled
- Fix b/
10638903
Change-Id: I1c09661b0e5ac8d089a515b64301ddfe9bcedaa9
Lifu Tang [Sat, 7 Sep 2013 00:19:13 +0000 (17:19 -0700)]
am
fbf2d276: Merge "Made "No Recent Apps" banner brighter" into klp-dev
* commit '
fbf2d276353e76958484b0489df84f5b6ef8feef':
Made "No Recent Apps" banner brighter
Lifu Tang [Sat, 7 Sep 2013 00:15:26 +0000 (00:15 +0000)]
Merge "Made "No Recent Apps" banner brighter" into klp-dev
Robert Greenwalt [Fri, 6 Sep 2013 23:37:52 +0000 (16:37 -0700)]
am
8ad8bfd9: Merge "Use the application name instead of package." into klp-dev
* commit '
8ad8bfd9aa871473a3cd1546bed34a366bfaa74f':
Use the application name instead of package.
Robert Greenwalt [Fri, 6 Sep 2013 23:35:45 +0000 (23:35 +0000)]
Merge "Use the application name instead of package." into klp-dev
Lifu Tang [Fri, 6 Sep 2013 23:05:23 +0000 (16:05 -0700)]
Made "No Recent Apps" banner brighter
- Fix b/
10638903
Change-Id: I83d3dc30315c05844ed57ee3065b099ce1ec1f96
Svetoslav Ganov [Fri, 6 Sep 2013 16:28:32 +0000 (09:28 -0700)]
Print service settings polish
1. Moved the settings and add printers to the overflow menu.
2. Collapsing the search action view to get proper behavior when selected.
3. Showing the search option only if there are printers.
4. Stop observing for printers if the service is disabled.
bug:
10652301
Change-Id: I589a3b177c5a58a8b1382d7020fd4b128afd9038
Fabrice Di Meglio [Fri, 6 Sep 2013 20:38:45 +0000 (13:38 -0700)]
am
4c7de613: Merge "Fix bug #
10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings" into klp-dev
* commit '
4c7de61320f3ea1df8d5cdd3d0645830b67722ea':
Fix bug #
10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings
Tom O'Neill [Fri, 6 Sep 2013 20:38:41 +0000 (13:38 -0700)]
am
421dccd5: Restrict Settings injection to system-signed apps
* commit '
421dccd5dd8cdec03bbc704b142f3ca2396f7e40':
Restrict Settings injection to system-signed apps
Fabrice Di Meglio [Fri, 6 Sep 2013 20:05:17 +0000 (20:05 +0000)]
Merge "Fix bug #
10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings" into klp-dev
Fabrice Di Meglio [Fri, 6 Sep 2013 00:02:28 +0000 (17:02 -0700)]
Fix bug #
10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings
- well this CL is only for preventing a wrong rendering (the real CL would need to be one latter
and would need to fix the onDraw(Canvas) for LinearColorBar so that it takes care of the layout direction)
- force LTR layout direction on the LinearColorBar, hence preventing the two TextView to render their
text "in the middle".
- use BidiFormatter to wrap number strings
Change-Id: Ie164e5509c0364a81c85a3ac69f97a89f20a4130
Tom O'Neill [Fri, 6 Sep 2013 17:38:26 +0000 (10:38 -0700)]
Restrict Settings injection to system-signed apps
- Also: reload the injected settings status values on mode changes
- b/
10461474
Change-Id: I58c817ab8ab253aa19fa02c3cb511f26c807dc2a
Baligh Uddin [Fri, 6 Sep 2013 03:36:00 +0000 (20:36 -0700)]
am
f1e0c65e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
f1e0c65efb0c1f070d4202170843bec26743fd31':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 6 Sep 2013 03:34:18 +0000 (03:34 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Lifu Tang [Fri, 6 Sep 2013 02:03:28 +0000 (19:03 -0700)]
am
0a0635c1: Merge "Don\'t show explicit time when no recent apps" into klp-dev
* commit '
0a0635c10ebf73d8133a7f96d6cae89ea9282dd2':
Don't show explicit time when no recent apps
Lifu Tang [Fri, 6 Sep 2013 02:01:17 +0000 (02:01 +0000)]
Merge "Don't show explicit time when no recent apps" into klp-dev
Amith Yamasani [Thu, 5 Sep 2013 22:51:37 +0000 (15:51 -0700)]
am
256637ff: Merge "Handle renamed APIs" into klp-dev
* commit '
256637ffb3cd5482aff5d1d38b45145d1caab0a8':
Handle renamed APIs
Amith Yamasani [Thu, 5 Sep 2013 22:49:20 +0000 (22:49 +0000)]
Merge "Handle renamed APIs" into klp-dev
Lifu Tang [Thu, 5 Sep 2013 21:52:12 +0000 (14:52 -0700)]
am
8aea7b4d: Merge "Fixed the NullPointerException" into klp-dev
* commit '
8aea7b4d3d79163912f55a2d37657c4d33109655':
Fixed the NullPointerException
Lifu Tang [Thu, 5 Sep 2013 21:50:29 +0000 (14:50 -0700)]
Don't show explicit time when no recent apps
- Partial fix for b/
10638903
Change-Id: I38d681c52b3d03cdece48d3cdc027dcbe66bd0f2
Lifu Tang [Thu, 5 Sep 2013 21:47:00 +0000 (21:47 +0000)]
Merge "Fixed the NullPointerException" into klp-dev
Svetoslav Ganov [Thu, 5 Sep 2013 21:41:35 +0000 (14:41 -0700)]
am
10cbbc55: Merge "Print settings polish" into klp-dev
* commit '
10cbbc5515a30dfa347f0a7b816ebde8cbb0e0f7':
Print settings polish
Svetoslav Ganov [Thu, 5 Sep 2013 21:38:11 +0000 (21:38 +0000)]
Merge "Print settings polish" into klp-dev
Lifu Tang [Thu, 5 Sep 2013 20:52:55 +0000 (13:52 -0700)]
Fixed the NullPointerException
- Fix b/
10633295
Change-Id: Ia429e679c53c959351316ffda7619e10ad6a626c
Baligh Uddin [Thu, 5 Sep 2013 19:46:15 +0000 (12:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4e3b8d9ebc0a38940b8864bbee841002385f5fb2
Auto-generated-cl: translation import
Amith Yamasani [Thu, 5 Sep 2013 19:40:31 +0000 (12:40 -0700)]
Handle renamed APIs
Bug:
10461761
Change-Id: If63c3801663b347a4643e44d5bd3bab4e3049578
Przemyslaw Szczepaniak [Thu, 5 Sep 2013 13:26:44 +0000 (06:26 -0700)]
am
80c2b9b0: Hide "Play TTS sample" when locale is not settable as default
* commit '
80c2b9b0c4c03c5ae9459875c05bc7370b7d6ca0':
Hide "Play TTS sample" when locale is not settable as default
Przemyslaw Szczepaniak [Thu, 5 Sep 2013 12:05:04 +0000 (13:05 +0100)]
Hide "Play TTS sample" when locale is not settable as default
Due to a bug, it's possible for settings to show status telling
that locale is available, despite locale not being in list of
locales settable as TTS default locale. This change fixes it.
Bug:
10630713
Change-Id: I21f8487fc6c1ea7812aeffbc26dfa5fc0a8afa3b
Svetoslav Ganov [Thu, 5 Sep 2013 06:52:28 +0000 (23:52 -0700)]
Print settings polish
1. Added support for launching the top level print settings.
2. Updated some strings.
3. Removed the uninstall option for a print service.
4. Added search for the list of printers of a print service.
Change-Id: I9e175ba78b2d22b2bf90cf79153dc73327dfaff1
Dianne Hackborn [Thu, 5 Sep 2013 01:31:29 +0000 (18:31 -0700)]
am
dd600b60: Merge "Add details screen to proc stats." into klp-dev
* commit '
dd600b603d98e28219a9a38a62f2527db05736bb':
Add details screen to proc stats.
Dianne Hackborn [Thu, 5 Sep 2013 01:26:41 +0000 (01:26 +0000)]
Merge "Add details screen to proc stats." into klp-dev
Dianne Hackborn [Wed, 4 Sep 2013 22:47:59 +0000 (15:47 -0700)]
Add details screen to proc stats.
Lets you see the actual RAM use and % running time, a list of
all of the services that are associated with it (kind-of, not
working correctly for those that share processes), and most
importantly a glorious FORCE STOP button.
Change-Id: I34ac30c88f1187227a8a7809ae103118c8b9a865
Svetoslav [Thu, 5 Sep 2013 00:20:45 +0000 (17:20 -0700)]
am
f7092bc6: Merge "Implementing print settings as per UX spec." into klp-dev
* commit '
f7092bc6bfb16695d73f984d3c2cf557c63a17f1':
Implementing print settings as per UX spec.
Svetoslav [Thu, 5 Sep 2013 00:18:48 +0000 (00:18 +0000)]
Merge "Implementing print settings as per UX spec." into klp-dev
Chong Zhang [Wed, 4 Sep 2013 22:11:34 +0000 (15:11 -0700)]
am
35ec3b7f: Merge "wifi-display: add drop down list for Wps config method" into klp-dev
* commit '
35ec3b7fa389e9a2ddc131eb3a75b2f3dbc8330e':
wifi-display: add drop down list for Wps config method
Chong Zhang [Wed, 4 Sep 2013 22:07:18 +0000 (22:07 +0000)]
Merge "wifi-display: add drop down list for Wps config method" into klp-dev
Svetoslav [Wed, 4 Sep 2013 04:32:40 +0000 (21:32 -0700)]
Implementing print settings as per UX spec.
Change-Id: Iafe99a1e959472f893cf168d952d9dd19ff160c0
Tom O'Neill [Wed, 4 Sep 2013 14:22:29 +0000 (07:22 -0700)]
am
97df9822: Merge "Switch to receiving LocationManager.MODE_CHANGED_ACTION" into klp-dev
* commit '
97df982296244cc067c281b97ff2a6ade2a8ca31':
Switch to receiving LocationManager.MODE_CHANGED_ACTION
Tom O'Neill [Wed, 4 Sep 2013 14:20:03 +0000 (14:20 +0000)]
Merge "Switch to receiving LocationManager.MODE_CHANGED_ACTION" into klp-dev
Baligh Uddin [Wed, 4 Sep 2013 05:02:40 +0000 (22:02 -0700)]
am
c63e097a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c63e097aa7b6200f78714da892ef6a3fe0bd4aba':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 4 Sep 2013 05:00:08 +0000 (05:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Amith Yamasani [Wed, 4 Sep 2013 01:00:17 +0000 (18:00 -0700)]
am
9b444f78: Merge "Pass correct user id for the extra" into klp-dev
* commit '
9b444f78f14384b59b01f966b044bb23c6af4982':
Pass correct user id for the extra
Amith Yamasani [Wed, 4 Sep 2013 00:55:18 +0000 (00:55 +0000)]
Merge "Pass correct user id for the extra" into klp-dev
Amith Yamasani [Wed, 4 Sep 2013 00:44:49 +0000 (17:44 -0700)]
Pass correct user id for the extra
This was causing PrintManagerService to get a broadcast with an incorrect
userid and ended up crashing the SettingsProvider.
Bug:
10608503
Change-Id: I4693de181ddfa599d685ac9bd16ac15cea8b2e52
Geoffrey Borggaard [Wed, 4 Sep 2013 00:43:51 +0000 (17:43 -0700)]
am
af6cdb2b: Merge "Pin protect going into developer mode." into klp-dev
* commit '
af6cdb2b30a875b0a563196bb5c405b080b3cbe0':
Pin protect going into developer mode.
Geoffrey Borggaard [Wed, 4 Sep 2013 00:41:50 +0000 (00:41 +0000)]
Merge "Pin protect going into developer mode." into klp-dev
Lifu Tang [Wed, 4 Sep 2013 00:16:14 +0000 (17:16 -0700)]
am
f4c4294c: Merge "Renamed "Location services" to "App settings"" into klp-dev
* commit '
f4c4294c502d774c1c56d6b2dca56a604cc85f87':
Renamed "Location services" to "App settings"
Lifu Tang [Wed, 4 Sep 2013 00:13:09 +0000 (00:13 +0000)]
Merge "Renamed "Location services" to "App settings"" into klp-dev
Vineeta Srivastava [Tue, 3 Sep 2013 23:52:51 +0000 (16:52 -0700)]
am
58db3418: Merge "Show regulatory info based on hardware sku in Settings app." into klp-dev
* commit '
58db341851a0858339f83b432807e6ed87ca9fe5':
Show regulatory info based on hardware sku in Settings app.
Vineeta Srivastava [Tue, 3 Sep 2013 23:48:34 +0000 (23:48 +0000)]
Merge "Show regulatory info based on hardware sku in Settings app." into klp-dev
Lifu Tang [Tue, 3 Sep 2013 23:36:56 +0000 (16:36 -0700)]
Renamed "Location services" to "App settings"
- Fix b/
10610559
Change-Id: I7f7167fb45ebeb045b4c0095448de0134a551eec
Lifu Tang [Tue, 3 Sep 2013 21:29:13 +0000 (14:29 -0700)]
am
b3cd38ea: Merge "Fixed the crash on screen rotation" into klp-dev
* commit '
b3cd38eab4402a95e779d4d0b92480b7c53fa473':
Fixed the crash on screen rotation