Sanket Padawe
8378487f48
am ec422334
: am 0c3ce4e4
: am b331c393
: Merge "Hotspot 2.0 UI for saved network." into mnc-dev
...
* commit 'ec42233484d7648f51ffe5c49c51b33beb735b29':
Hotspot 2.0 UI for saved network.
2015-05-14 06:53:55 +00:00
Geoff Mendal
a6662b084b
am 4472e4af
: (-s ours) am e17a1128
: (-s ours) am ecac0e55
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '4472e4af82268b1c64f4a5bb1318161114f960af':
Import translations. DO NOT MERGE
2015-05-14 06:53:53 +00:00
Sanket Padawe
ec42233484
am 0c3ce4e4
: am b331c393
: Merge "Hotspot 2.0 UI for saved network." into mnc-dev
...
* commit '0c3ce4e4bd503af6f48cb7b109c1301efc149c47':
Hotspot 2.0 UI for saved network.
2015-05-14 06:38:08 +00:00
Geoff Mendal
4472e4af82
am e17a1128
: (-s ours) am ecac0e55
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'e17a11284ce3b093c9baf40e057f0327d1d4060f':
Import translations. DO NOT MERGE
2015-05-14 06:38:07 +00:00
Sanket Padawe
0c3ce4e4bd
am b331c393
: Merge "Hotspot 2.0 UI for saved network." into mnc-dev
...
* commit 'b331c3937d07d44354bf882ae0e30e77aef9e875':
Hotspot 2.0 UI for saved network.
2015-05-14 02:43:40 +00:00
Geoff Mendal
e17a11284c
am ecac0e55
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'ecac0e55906082fd1d1e65554a87625179ba7445':
Import translations. DO NOT MERGE
2015-05-14 02:43:38 +00:00
Sanket Padawe
b331c3937d
Merge "Hotspot 2.0 UI for saved network." into mnc-dev
2015-05-14 02:40:40 +00:00
Geoff Mendal
ecac0e5590
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-05-14 02:35:42 +00:00
Geoff Mendal
1760c0a34d
Import translations. DO NOT MERGE
...
Change-Id: I9ef3b09a81c284f0bdeb0493ce73616d10fca3c3
Auto-generated-cl: translation import
2015-05-13 19:27:55 -07:00
Svet Ganov
8a79a41334
am afadcacf
: am 9c083c55
: am f96bcb41
: Merge "Access mock location is no longer a runtime permission - settings" into mnc-dev
...
* commit 'afadcacfa0b420611cc2108099232e9b953983b1':
Access mock location is no longer a runtime permission - settings
2015-05-14 00:56:15 +00:00
Svet Ganov
afadcacfa0
am 9c083c55
: am f96bcb41
: Merge "Access mock location is no longer a runtime permission - settings" into mnc-dev
...
* commit '9c083c5597d4096e48a0202d2a0682d56951d78f':
Access mock location is no longer a runtime permission - settings
2015-05-14 00:43:27 +00:00
Svet Ganov
9c083c5597
am f96bcb41
: Merge "Access mock location is no longer a runtime permission - settings" into mnc-dev
...
* commit 'f96bcb41cb62febdf3ce5d8e6f9cceb3ecc7f403':
Access mock location is no longer a runtime permission - settings
2015-05-14 00:00:40 +00:00
Svet Ganov
f96bcb41cb
Merge "Access mock location is no longer a runtime permission - settings" into mnc-dev
2015-05-13 23:45:40 +00:00
Nick Kralevich
ebe774d921
am 2b4046b8
: am 7f5d86be
: am a7791754
: Merge "New UI for controlling USB" into mnc-dev
...
* commit '2b4046b8e5741bf58617971a825422c535330ecd':
New UI for controlling USB
2015-05-13 22:58:42 +00:00
Nick Kralevich
2b4046b8e5
am 7f5d86be
: am a7791754
: Merge "New UI for controlling USB" into mnc-dev
...
* commit '7f5d86be2a0b29f8739ebca1d20c1a8beb7b5c7d':
New UI for controlling USB
2015-05-13 22:52:09 +00:00
Svet Ganov
02e65a181a
Access mock location is no longer a runtime permission - settings
...
The access mock location is no longer a runtime permission. It is a
signature protected one that apps cannot get but the fact they request
it means they want to inject location into the system. Now the user
gets to choose the current mock location app in developer options from
the apps that request the mock location permission. The access to mock
location is no longer guarded by the permisson but from a new app op
which is off by default and the settiings UI sets it to enabled only
for the currently selected mock location app.
bug:21078873
Change-Id: I6555179ecf0cc37d9bb857e9dfb3b04c091ea612
2015-05-13 15:45:03 -07:00
Nick Kralevich
7f5d86be2a
am a7791754
: Merge "New UI for controlling USB" into mnc-dev
...
* commit 'a779175466df47dc15366af9fcd1d4fcacd11318':
New UI for controlling USB
2015-05-13 22:40:13 +00:00
Nick Kralevich
a779175466
Merge "New UI for controlling USB" into mnc-dev
2015-05-13 22:32:15 +00:00
Nick Kralevich
7000d54338
New UI for controlling USB
...
Create a new UI for managing USB access control. This UI is implemented
as a transparent popup triggered by a persistent notification.
Delete the old UI for controlling this. It is no longer used.
Bug: 18905620
Change-Id: I54186961414447a9d37f68e946e1c167506170ae
2015-05-13 15:23:52 -07:00
Robert Greenwalt
c516a28cb5
am 8fc345fb
: am a1a2c91b
: Merge "Remove phone information for a secondary user"
...
* commit '8fc345fb2e64ff916432a445fb4bc5f4e314cb32':
Remove phone information for a secondary user
2015-05-13 22:00:26 +00:00
Robert Greenwalt
8fc345fb2e
am a1a2c91b
: Merge "Remove phone information for a secondary user"
...
* commit 'a1a2c91b7d1ad950a8636aaa029077b9e6e81aed':
Remove phone information for a secondary user
2015-05-13 21:43:39 +00:00
Robert Greenwalt
a1a2c91b7d
Merge "Remove phone information for a secondary user"
2015-05-13 21:20:51 +00:00
Sanket Padawe
1c8d14f8e7
am dd50e4a3
: am 715f89d4
: am d7139802
: Merge "Start bluetooth scan on screen orientation change." into mnc-dev
...
* commit 'dd50e4a3f6925a6a39769c793d47d0f9832447cf':
Start bluetooth scan on screen orientation change.
2015-05-13 20:35:49 +00:00
Sanket Padawe
dd50e4a3f6
am 715f89d4
: am d7139802
: Merge "Start bluetooth scan on screen orientation change." into mnc-dev
...
* commit '715f89d44ee2a53fd48fe8197a3f42494aa0082f':
Start bluetooth scan on screen orientation change.
2015-05-13 20:24:13 +00:00
Sanket Padawe
715f89d44e
am d7139802
: Merge "Start bluetooth scan on screen orientation change." into mnc-dev
...
* commit 'd713980221f01aeda96337a3158a8f5f1c2d701f':
Start bluetooth scan on screen orientation change.
2015-05-13 20:11:43 +00:00
Sanket Padawe
d713980221
Merge "Start bluetooth scan on screen orientation change." into mnc-dev
2015-05-13 20:00:13 +00:00
Jason Monk
b1c5ba778b
am fdd5e73f
: am c1dc5acf
: am f1536e4a
: Merge "Hide permission related summaries" into mnc-dev
...
* commit 'fdd5e73f7ba2b528f40a6f83009347e5c93eb4fb':
Hide permission related summaries
2015-05-13 19:59:01 +00:00
Jason Monk
fdd5e73f7b
am c1dc5acf
: am f1536e4a
: Merge "Hide permission related summaries" into mnc-dev
...
* commit 'c1dc5acfb0ea098ba85af413b37b54df3472a831':
Hide permission related summaries
2015-05-13 19:48:04 +00:00
John Spurlock
c6b97b7098
am 91ab24ed
: am fad62c47
: am 07851208
: Merge "Settings: New string for zen messages summary." into mnc-dev
...
* commit '91ab24ed3b01cda0104352bcaa6cf89b42caa5e8':
Settings: New string for zen messages summary.
2015-05-13 19:39:25 +00:00
Jason Monk
c1dc5acfb0
am f1536e4a
: Merge "Hide permission related summaries" into mnc-dev
...
* commit 'f1536e4a1b02055efbe27d963aa7c1df64681783':
Hide permission related summaries
2015-05-13 19:37:07 +00:00
Jason Monk
d40954e200
am 5fd31256
: am 3a6561ca
: am 78161c73
: Merge "Add additional permissions button to manage perms" into mnc-dev
...
* commit '5fd31256a9d323f11a2ecfd741018923b8aa3b59':
Add additional permissions button to manage perms
2015-05-13 19:28:45 +00:00
John Spurlock
91ab24ed3b
am fad62c47
: am 07851208
: Merge "Settings: New string for zen messages summary." into mnc-dev
...
* commit 'fad62c472678c180475fb73463103209a1b5bd83':
Settings: New string for zen messages summary.
2015-05-13 19:28:41 +00:00
Jason Monk
f1536e4a1b
Merge "Hide permission related summaries" into mnc-dev
2015-05-13 19:22:47 +00:00
Jason Monk
63a819aa35
Hide permission related summaries
...
We need to get this data from the PackageInstaller directly, in the
mean time hide the summaries since they are incorrect.
Bug: 21078474
Change-Id: I1c1b50ee6806cfbf16830fbff5bf8ffae344451a
2015-05-13 15:19:57 -04:00
John Spurlock
fad62c4726
am 07851208
: Merge "Settings: New string for zen messages summary." into mnc-dev
...
* commit '07851208fc43afb343085bbfc9fbab6741d8bb03':
Settings: New string for zen messages summary.
2015-05-13 19:16:08 +00:00
Jason Monk
5fd31256a9
am 3a6561ca
: am 78161c73
: Merge "Add additional permissions button to manage perms" into mnc-dev
...
* commit '3a6561ca4112b1f9da790064b784b8a00a6e9106':
Add additional permissions button to manage perms
2015-05-13 19:10:42 +00:00
John Spurlock
07851208fc
Merge "Settings: New string for zen messages summary." into mnc-dev
2015-05-13 19:07:51 +00:00
John Spurlock
fcfcb5ddc4
Settings: New string for zen messages summary.
...
Bug: 20064962
Change-Id: Ie39ee78b2ec351f6b41ad5584af44966efb2a3aa
2015-05-13 15:02:58 -04:00
Jason Monk
3a6561ca41
am 78161c73
: Merge "Add additional permissions button to manage perms" into mnc-dev
...
* commit '78161c737557cdfea30e6ac3e06be75db72b1cd8':
Add additional permissions button to manage perms
2015-05-13 18:54:47 +00:00
Jason Monk
78161c7375
Merge "Add additional permissions button to manage perms" into mnc-dev
2015-05-13 18:40:51 +00:00
Jason Monk
c25f11889c
Add additional permissions button to manage perms
...
Bug: 20269176
Change-Id: Ic004204b0fd984717a6d3848e8295edc67047883
2015-05-13 14:40:02 -04:00
Chris Wren
3cea835584
am 663f71b4
: am 0e63a138
: am 0c3d8f1c
: Merge "replace temporary metrics categories with permanent ones." into mnc-dev
...
* commit '663f71b4c1be4606d598a4a1bed774ed0d0431d9':
replace temporary metrics categories with permanent ones.
2015-05-13 18:34:41 +00:00
Chris Wren
663f71b4c1
am 0e63a138
: am 0c3d8f1c
: Merge "replace temporary metrics categories with permanent ones." into mnc-dev
...
* commit '0e63a138aa9e45cd6fdd4877676eda2973ea7bd0':
replace temporary metrics categories with permanent ones.
2015-05-13 18:24:01 +00:00
Chris Wren
0e63a138aa
am 0c3d8f1c
: Merge "replace temporary metrics categories with permanent ones." into mnc-dev
...
* commit '0c3d8f1c0f869f5faa4b828e118f8717c8f77d40':
replace temporary metrics categories with permanent ones.
2015-05-13 18:15:33 +00:00
Chris Wren
0c3d8f1c0f
Merge "replace temporary metrics categories with permanent ones." into mnc-dev
2015-05-13 18:06:00 +00:00
Xiyuan Xia
6cee8eae19
am ae900bc6
: am fe2cee7b
: am e2862a00
: Merge "Migrate settings UI to use async security check" into mnc-dev
...
* commit 'ae900bc65e9d724d255ee1602cc5868db7e4d837':
Migrate settings UI to use async security check
2015-05-13 17:56:57 +00:00
Jason Monk
9aff041588
am 921bda5c
: am 2863a945
: am a8dae2af
: Merge "Start app notifications as fragment not intent" into mnc-dev
...
* commit '921bda5c71905b30eae0834af3dcc0197a95578e':
Start app notifications as fragment not intent
2015-05-13 17:56:56 +00:00
Xiyuan Xia
ae900bc65e
am fe2cee7b
: am e2862a00
: Merge "Migrate settings UI to use async security check" into mnc-dev
...
* commit 'fe2cee7b2d7d2ac75e7449892706a6f2e24ffb4a':
Migrate settings UI to use async security check
2015-05-13 17:46:11 +00:00
Jason Monk
921bda5c71
am 2863a945
: am a8dae2af
: Merge "Start app notifications as fragment not intent" into mnc-dev
...
* commit '2863a9457a9ca10654bc0028b5eb03449041e509':
Start app notifications as fragment not intent
2015-05-13 17:46:10 +00:00
Chris Wren
8b7dc08e77
replace temporary metrics categories with permanent ones.
...
Bug: 21114836
Change-Id: I05ca033e2e15fc1ae4330453bbe50aaa6cd1ea6c
2015-05-13 13:44:36 -04:00