Commit Graph

16458 Commits

Author SHA1 Message Date
Geoff Mendal
7e5cd2830f Import translations. DO NOT MERGE
Change-Id: I1cd9781471c0c3c1c74fc429e9013e9e8dfeef41
Auto-generated-cl: translation import
2014-12-15 06:42:32 -08:00
Geoff Mendal
d33d2127f7 am d3affe47: (-s ours) Import translations. DO NOT MERGE
* commit 'd3affe47eedcdc6aa2bfd829f55fce8ed2be7e72':
  Import translations. DO NOT MERGE
2014-12-15 14:36:51 +00:00
Geoff Mendal
d3affe47ee Import translations. DO NOT MERGE
Change-Id: I07a9426156ec5f40cded12af58aca05723a55005
Auto-generated-cl: translation import
2014-12-15 06:26:44 -08:00
Lucky Zhang
03f336d07c am 5f17119f: Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev
* commit '5f17119f4683617ed5444c088b0439bb005a3514':
  [FRP] Notification screen slides in wrong direction
2014-12-13 00:24:20 +00:00
Lucky Zhang
5f17119f46 Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev 2014-12-13 00:15:32 +00:00
PauloftheWest
a886d69f9d Fixed then icons of SIMs in the call dialog.
Bug: 18672758
Change-Id: I812e79a48b048f8449cc07fdcccab57a114cdd24
2014-12-12 12:21:17 -08:00
John Spurlock
e964060b5d am b4805e3a: Settings: Allow more lines of saver feature description text.
* commit 'b4805e3a3481196a0e945d397bef0950a843f5a3':
  Settings: Allow more lines of saver feature description text.
2014-12-12 19:04:24 +00:00
John Spurlock
b4805e3a34 Settings: Allow more lines of saver feature description text.
Bug: 18706906
Change-Id: I27bfd5e70c3e20c17fcad691cfb3c9f74d7d0390
2014-12-12 12:54:48 -05:00
Wink Saville
fc748fe9da am 8a21ab00: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev
* commit '8a21ab00e5ec5141e4bd745ab9e7f161db98cb1a':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
2014-12-12 04:37:35 +00:00
Wink Saville
8a21ab00e5 Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 2014-12-12 04:23:16 +00:00
Maurice Lam
56e6cf5565 [FRP] Open the lock setup screens in same task
Set the taskAffinity of of the lock setup screens so that the
transitions behave correctly.

Bug: 18724458
Change-Id: Ibca7adfad1e5bd07c7e7d2e1beb279c5e57ac735
2014-12-11 18:22:08 -08:00
Lucky Zhang
47811fe057 [FRP] Notification screen slides in wrong direction
The method that launches notification screen from choose lock activity
finished the original activity before starting the new activity. This
made the system think it is a backward transition instead of a forward
one. Swapping the order to start new activity first and then finish
old activity fixed the problem.

This also changes the behavior in settings. However, it seems like this
is also the desired behavior for settings.

Bug: 18723199
Change-Id: I90538fa52e0d62a2274c8e0333682035849802c6
2014-12-11 18:10:01 -08:00
Prem Kumar
f41c6c4577 am 96ca2cfd: Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev
* commit '96ca2cfd087078e4042f9ab9678c77dea136eefe':
  Clearing junk layout for add wifi dialog in settings.
2014-12-12 00:59:34 +00:00
Prem Kumar
96ca2cfd08 Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev 2014-12-12 00:52:32 +00:00
Sanket Padawe
9235e673f9 Clearing junk layout for add wifi dialog in settings.
Bug: 18359901
Change-Id: I9957efd0a6740ee470ee36b09a7b6884a0d2c63a
2014-12-11 15:48:45 -08:00
Sanket Padawe
75e0082ae8 Exiting activity on clicking outside dialog acitivity.
Bug: 18705619
Change-Id: I50cb08884f1c97352f5ad3a3e7d218b42af1ada4
2014-12-11 14:36:26 -08:00
Jason Monk
37832d661a Add a periodic check of the tethering provisioning
Add a service that handles the check through broadcasts which are
defined through configs, similar to the previous configs for the
activity.

Depends on I1f6e2d954562c5a16a0de60dac625005ec3e5c50

Bug: 18453076
Change-Id: I515d72706e9ca37877e67c44427af1b75b146390
2014-12-11 15:07:45 -05:00
Wink Saville
d72c062fa8 Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
2014-12-11 10:10:05 -08:00
Zoltan Szatmary-Ban
d0831ae214 Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev
automerge: 25a1181

* commit '25a1181f2a61d32481e7c66f96c2abf7aebd761e':
  Bring up correct app for Recent location list items
2014-12-11 15:09:56 +00:00
PauloftheWest
13028d1d90 Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev
automerge: 209c946

* commit '209c9465b3251c0a5e652214e402b1a54df234f9':
  Disabled SIM notifications while provisioning.
2014-12-11 15:09:31 +00:00
Zoltan Szatmary-Ban
25a1181f2a Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev 2014-12-11 13:23:30 +00:00
PauloftheWest
209c9465b3 Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev 2014-12-11 13:14:07 +00:00
PauloftheWest
5b3da0cc30 Disabled SIM notifications while provisioning.
Bug: 18672853
Change-Id: I01ba2927ad013649f13b959354a6493ba057e09f
2014-12-10 15:00:27 -08:00
Stuart Scott
b3dd601286 Show toast when cellular data option is changing.
bug: 18594162
Change-Id: I19dc265af47c0a40a6ace6d4bf42e21e035daf0a
2014-12-10 13:31:36 -08:00
PauloftheWest
87015c0166 am ab88ad93: Merge "Fixed a Data Usage crash" into lmp-mr1-dev
* commit 'ab88ad9381dda4afe59d00966cb783426f5f44a3':
  Fixed a Data Usage crash
2014-12-10 21:24:59 +00:00
PauloftheWest
ab88ad9381 Merge "Fixed a Data Usage crash" into lmp-mr1-dev 2014-12-10 21:16:10 +00:00
Alexandra Gherghina
0d04d8cbe8 am 32ca6f1f: Merge "Fix NPE in Running Processes view in Apps Settings" into lmp-mr1-dev
* commit '32ca6f1fbf2b9698afe99ad387580b38d07b50ca':
  Fix NPE in Running Processes view in Apps Settings
2014-12-10 17:47:14 +00:00
Alexandra Gherghina
32ca6f1fbf Merge "Fix NPE in Running Processes view in Apps Settings" into lmp-mr1-dev 2014-12-10 17:42:42 +00:00
PauloftheWest
f0d84e2e53 Fixed a Data Usage crash
Bug: 18364933
Change-Id: I80657c6541aec0b4706ef4aa229c9f858776aab2
2014-12-10 09:38:02 -08:00
Emily Bernier
b366a286b8 am 5a528b27: Merge "Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity" into lmp-mr1-dev
* commit '5a528b274f010c2aec5f188c620fabf674aa2637':
  Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity
2014-12-10 17:34:53 +00:00
Emily Bernier
5a528b274f Merge "Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity" into lmp-mr1-dev 2014-12-10 17:25:15 +00:00
Geoff Mendal
e73fa6afcd Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-10 14:47:32 +00:00
Geoff Mendal
38fa3d2fde Import translations. DO NOT MERGE
Change-Id: I3101f0a9a789a2cb20115e66f88ca96374594888
Auto-generated-cl: translation import
2014-12-10 06:39:51 -08:00
Geoff Mendal
e111474b0f am 26b04765: (-s ours) Import translations. DO NOT MERGE
* commit '26b0476586b736c25ddbe0c5f39793c5e5633a67':
  Import translations. DO NOT MERGE
2014-12-10 14:37:23 +00:00
Geoff Mendal
26b0476586 Import translations. DO NOT MERGE
Change-Id: I7bab4568e3a20facc24f3a09d337076e07d5d7ad
Auto-generated-cl: translation import
2014-12-10 06:24:00 -08:00
Alexandra Gherghina
f43aa811b7 Fix NPE in Running Processes view in Apps Settings
Bug: 18676587
Change-Id: Ib4b400241f0ebd6dd4aacad4bfdda6dfb75cdfb5
2014-12-10 10:24:31 +00:00
Maurice Lam
0fde6bb98a Merge "[FRP] Shrink lock screen when keyboard pops up" into lmp-mr1-dev
automerge: e0f637a

* commit 'e0f637a66b9dbaaec80ef36c52a96fbb65735790':
  [FRP] Shrink lock screen when keyboard pops up
2014-12-10 01:22:29 +00:00
Maurice Lam
e0f637a66b Merge "[FRP] Shrink lock screen when keyboard pops up" into lmp-mr1-dev 2014-12-10 01:17:15 +00:00
Emily Bernier
50ac12e222 Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity
In some cases, NETWORK_STATE_CHANGED_ACTION broadcasts are sent before
the current network state has been updated in ConnectivityService. Listening
for CONNECTIVITY_ACTION broadcasts as well ensures that we properly catch
new connections and auto-advance appropriately.

Bug: 18503725
Change-Id: Ia414d57d196d09171342fb3ae93c7e826cb1a1aa
2014-12-09 20:02:41 -05:00
PauloftheWest
58a73bbc0a am aa800609: Merge "Added Multi-SIM capability to Access Point Names" into lmp-mr1-dev
* commit 'aa800609304b4787091b1805b2439423b3192bb1':
  Added Multi-SIM capability to Access Point Names
2014-12-09 23:17:50 +00:00
PauloftheWest
bfb8449aea am e6d7b31f: Merge "Fixed a SIM Lock UI issue" into lmp-mr1-dev
* commit 'e6d7b31fc44ef6f0865ef22401217b70a6676eaa':
  Fixed a SIM Lock UI issue
2014-12-09 23:12:52 +00:00
PauloftheWest
aa80060930 Merge "Added Multi-SIM capability to Access Point Names" into lmp-mr1-dev 2014-12-09 23:10:36 +00:00
PauloftheWest
e6d7b31fc4 Merge "Fixed a SIM Lock UI issue" into lmp-mr1-dev 2014-12-09 23:04:19 +00:00
Zoltan Szatmary-Ban
d80e1278b0 Bring up correct app for Recent location list items
When clicking on a list item in Settings > Location > Recent locations,
the correct app should be shown for items corresponding to managed
profile apps.

Bug: 17655978
Change-Id: Ie4b388f0ea103ee16629b0d8d92e5de08adffc5e
2014-12-09 19:20:21 +00:00
Wink Saville
f8c4fe2d3c am 85d3b0fa: Merge "Add debug dataEnable." into lmp-mr1-dev
* commit '85d3b0fa6e2e8988f48a5a830dc3d279d05619fd':
  Add debug dataEnable.
2014-12-09 17:58:30 +00:00
Wink Saville
85d3b0fa6e Merge "Add debug dataEnable." into lmp-mr1-dev 2014-12-09 17:52:20 +00:00
Maurice Lam
a49c7c572f [FRP] Shrink lock screen when keyboard pops up
Because setup wizard uses immersive mode, the default adjustResize
flag doesn't work; so we need to respond to window insets manually.

Bug: 18651680
Change-Id: I9e53d3455c41404cca8a347b49b559200353b7ac
2014-12-08 18:43:11 -08:00
Prem Kumar
35b3257e07 am 1e1251cc: Merge "Fixed a SIM Cards crash." into lmp-mr1-dev
* commit '1e1251cc04ee9636721719aa0a13d94e15500258':
  Fixed a SIM Cards crash.
2014-12-09 02:30:23 +00:00
Prem Kumar
1e1251cc04 Merge "Fixed a SIM Cards crash." into lmp-mr1-dev 2014-12-09 02:25:15 +00:00
John Spurlock
8aa3e66389 am 1e3be7d9: Merge "Settings: Rebind to volume sliders after returning from stopped." into lmp-mr1-dev
* commit '1e3be7d9ce27cf5ee7df78c675603a628eb0023d':
  Settings: Rebind to volume sliders after returning from stopped.
2014-12-09 00:08:42 +00:00