PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,862 Commits 1 Branch 0 Tags
ae6ea36822dca031facb1c502aa9d527ceba658c
Commit Graph

18862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
7a250b8288 Stop using apache-http in settings. 
Most of this usage is from crufty "test" code, and is trivially
replacable.

bug: 18027885

(cherry picked from commit f25627c0c9)

Change-Id: I62b0c4e79812ae69767d778eb9e866cbba1d50e0
 2014-12-15 14:32:38 +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
Narayan Kamath
fa89388641 Merge "Stop using apache-http in settings." 2014-12-15 14:23:47 +00:00
Zoltan Szatmary-Ban
2960b9392e Merge "Show removed user's data usage under its correct item" 2014-12-15 11:22:24 +00:00
Lucky Zhang
a6f6e5a35b am 03f336d0: am 5f17119f: Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev 
* commit '03f336d07c055b6870dd18ab0096f9e5b085ff51':
  [FRP] Notification screen slides in wrong direction
 2014-12-13 00:29:43 +00: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
John Spurlock
3d51b61f6c am 3eaa3506: am e964060b: am b4805e3a: Settings: Allow more lines of saver feature description text. 
* commit '3eaa35064a4e5a2eb1c57b465903e36774e27820':
  Settings: Allow more lines of saver feature description text.
 2014-12-12 20:56:40 +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
3eaa35064a am e964060b: am b4805e3a: Settings: Allow more lines of saver feature description text. 
* commit 'e964060b5de4b534431b58c2ac4fae9fdd6baedc':
  Settings: Allow more lines of saver feature description text.
 2014-12-12 19:08:46 +00: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
Zoltan Szatmary-Ban
cd9b1507fb Show removed user's data usage under its correct item 
Users for which UserManager.getUserInfo returned null were shown as
unnamed users on Settings > Data Usage. This behavior has now changed
to show their data usage under the same item as UID_REMOVED.

Bug: 18174376
Change-Id: I8d172647edb51f7a277b4b714e9b7f3a0b5f3154
 2014-12-12 18:48:03 +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
Narayan Kamath
f25627c0c9 Stop using apache-http in settings. 
Most of this usage is from crufty "test" code, and is trivially
replacable.

bug: 18027885

Change-Id: If4441a5e76405eba068479a4dcaa6012b5a74cbf
 2014-12-12 14:22:06 +00:00
Wink Saville
47a05fc45b am f5d6dd6a: am 8a21ab00: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev automerge: fc748fe 
* commit 'f5d6dd6a11ef0fd7518ba5905571c714e4b2df33':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
 2014-12-12 04:48:31 +00:00
Wink Saville
f5d6dd6a11 am 8a21ab00: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 
automerge: fc748fe

* commit 'fc748fe9da449e427887c6d2381f9bd4462de56f':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
 2014-12-12 04:42:28 +00:00
Prem Kumar
394cc0a898 am 78670560: am 96ca2cfd: Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev automerge: f41c6c4 
* commit '78670560cddf0f1e2cff7dab57b2ac768f917367':
  Clearing junk layout for add wifi dialog in settings.
 2014-12-12 04:40:32 +00: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
Prem Kumar
78670560cd am 96ca2cfd: Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev 
automerge: f41c6c4

* commit 'f41c6c4577169880a2c339ec84d93078513b3402':
  Clearing junk layout for add wifi dialog in settings.
 2014-12-12 04:31:59 +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
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
d2acd90533 am 1162cf30: Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev automerge: 25a1181 automerge: d0831ae 
* commit '1162cf3084c6e077e2a0cafb831fe16a18e0be62':
  Bring up correct app for Recent location list items
 2014-12-11 18:07:36 +00:00
PauloftheWest
2ad430e742 am e391e713: Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev automerge: 209c946 automerge: 13028d1 
* commit 'e391e713cb34648ad6fc9d3f7336c574acc4787c':
  Disabled SIM notifications while provisioning.
 2014-12-11 18:07:34 +00:00
Zoltan Szatmary-Ban
1162cf3084 Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev automerge: 25a1181 
automerge: d0831ae

* commit 'd0831ae2144ce9c2eae2f11be2f4ed3689df2597':
  Bring up correct app for Recent location list items
 2014-12-11 18:02:29 +00:00
PauloftheWest
e391e713cb Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev automerge: 209c946 
automerge: 13028d1

* commit '13028d1d90a995b71999ee7c00f04adabd9cb7ff':
  Disabled SIM notifications while provisioning.
 2014-12-11 18:02:17 +00: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
fe3b679090 am 87015c01: am ab88ad93: Merge "Fixed a Data Usage crash" into lmp-mr1-dev 
automerge: 6a8b163

* commit '6a8b1634c053192d2abfdd8f1e0f5df9aecbf216':
  Fixed a Data Usage crash
 2014-12-11 00:11:24 +00:00
PauloftheWest
6a8b1634c0 am 87015c01: am ab88ad93: Merge "Fixed a Data Usage crash" into lmp-mr1-dev 
* commit '87015c0166d84b86fd1067f7e4effbe898b60c7c':
  Fixed a Data Usage crash
 2014-12-11 00:07:03 +00:00
PauloftheWest
5b3da0cc30 Disabled SIM notifications while provisioning. 
Bug: 18672853
Change-Id: I01ba2927ad013649f13b959354a6493ba057e09f
 2014-12-10 15:00:27 -08:00
Alexandra Gherghina
4b9be76b1d am 0d04d8cb: am 32ca6f1f: Merge "Fix NPE in Running Processes view in Apps Settings" into lmp-mr1-dev 
automerge: a8f7074

* commit 'a8f70740c495f7d3f47db65bb08ccdb58c52b178':
  Fix NPE in Running Processes view in Apps Settings
 2014-12-10 22:28:34 +00:00
Emily Bernier
ff7c75cd17 am b366a286: am 5a528b27: Merge "Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity" into lmp-mr1-dev 
automerge: 7a3b253

* commit '7a3b253f086150ab030db967862002795a29bb83':
  Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity
 2014-12-10 22:28:17 +00:00
Geoff Mendal
e80efe05f4 am e73fa6af: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: bf09ae7  -s ours

* commit 'bf09ae787b811733c5b719404d89e296ca92a574':
  Import translations. DO NOT MERGE
 2014-12-10 22:27:38 +00:00
Geoff Mendal
641825a8c4 am e111474b: (-s ours) am 26b04765: (-s ours) Import translations. DO NOT MERGE 
automerge: d580efb  -s ours

* commit 'd580efb9336d13feff1b1ab236ae2f026434c386':
  Import translations. DO NOT MERGE
 2014-12-10 22:27:29 +00:00
Alexandra Gherghina
a8f70740c4 am 0d04d8cb: am 32ca6f1f: Merge "Fix NPE in Running Processes view in Apps Settings" into lmp-mr1-dev 
* commit '0d04d8cbe8754e75a429f851d0d5a1b14829688b':
  Fix NPE in Running Processes view in Apps Settings
 2014-12-10 22:23:57 +00:00
Emily Bernier
7a3b253f08 am b366a286: am 5a528b27: Merge "Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity" into lmp-mr1-dev 
* commit 'b366a286b869890ebbf59f2400c37c97661fe8fa':
  Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity
 2014-12-10 22:23:54 +00:00
Geoff Mendal
bf09ae787b am e73fa6af: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'e73fa6afcd3f2890abf5a98107ff5387a0165ebc':
  Import translations. DO NOT MERGE
 2014-12-10 22:22:35 +00:00
Geoff Mendal
d580efb933 am e111474b: (-s ours) am 26b04765: (-s ours) Import translations. DO NOT MERGE 
* commit 'e111474b0fa936821b7fad36506dc8e91a85eb23':
  Import translations. DO NOT MERGE
 2014-12-10 22:22:34 +00: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