Commit Graph

38305 Commits

Author SHA1 Message Date
TreeHugger Robot
a8cae6b71d Merge "BidiFormat wrap version code in installed app detail UI" 2017-07-19 00:52:38 +00:00
Rajeev Kumar
282dab7dfe Merge "Data plan usage summary fragment." 2017-07-19 00:02:50 +00:00
TreeHugger Robot
74c03cd8f4 Merge "Improve search indexing time." 2017-07-18 23:33:28 +00:00
Phil Weaver
fceaae7ec9 Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d am: 57f1af6a0b am: ae07650724 am: 3ae8ac0911 am: 8c1c7cae13
am: 587467249a

Change-Id: Ia5e0909a885ff68c524c023d1815bdbdd56c2237
2017-07-18 23:24:15 +00:00
Phil Weaver
672ac9809a Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3 am: a1426f209c am: 2e690de9cf am: 7a7d6b1d0c am: 3099a7f794 am: ce3fef5c99 am: b2d3c5e392
am: 42371fc2b3

Change-Id: Iae7d283152a3bd01c3812bb020dad774ad9535dd
2017-07-18 22:45:36 +00:00
Phil Weaver
e13342c1b2 Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d am: 57f1af6a0b am: ae07650724 am: 3ae8ac0911 am: 8ff3fd420c
am: 058b43c382

Change-Id: I8dfa0c4cd4c3ba804894238015b175a65d63ee0a
2017-07-18 22:45:03 +00:00
Phil Weaver
587467249a Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d am: 57f1af6a0b am: ae07650724 am: 3ae8ac0911
am: 8c1c7cae13

Change-Id: Ic89f371e4c6d8b169ac2b3d314b74155d9c2c0bd
2017-07-18 22:38:23 +00:00
Phil Weaver
f5c33cd9b0 Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3 am: a1426f209c am: 2e690de9cf am: 7a7d6b1d0c am: 3099a7f794 am: ce3fef5c99 am: 7c3daa9ba5
am: c62bb9efd7

Change-Id: I0c88909da60f3518b216a33aba3623c05c8ff5cf
2017-07-18 22:37:19 +00:00
Phil Weaver
42371fc2b3 Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3 am: a1426f209c am: 2e690de9cf am: 7a7d6b1d0c am: 3099a7f794 am: ce3fef5c99
am: b2d3c5e392

Change-Id: I3d42e6f17755ffd20d60cb75e04931e4b168b027
2017-07-18 22:28:15 +00:00
Phil Weaver
8c1c7cae13 Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d am: 57f1af6a0b am: ae07650724
am: 3ae8ac0911

Change-Id: Ie3af58a1cfe48fadbf32d9634483571fc12c1d52
2017-07-18 22:22:39 +00:00
Phil Weaver
058b43c382 Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d am: 57f1af6a0b am: ae07650724 am: 3ae8ac0911
am: 8ff3fd420c

Change-Id: I6efd0f0905c346036a0d9e3392cd7b464948764a
2017-07-18 22:19:45 +00:00
Phil Weaver
8ff3fd420c Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d am: 57f1af6a0b am: ae07650724
am: 3ae8ac0911

Change-Id: Ib8797dc1e432871289cd528c0fe188132804e12f
2017-07-18 22:18:18 +00:00
Phil Weaver
c62bb9efd7 Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3 am: a1426f209c am: 2e690de9cf am: 7a7d6b1d0c am: 3099a7f794 am: ce3fef5c99
am: 7c3daa9ba5

Change-Id: I6d0d94bd7d9701e106ed3e8fe1852da5c1fedbc1
2017-07-18 22:15:51 +00:00
Phil Weaver
3ae8ac0911 Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d am: 57f1af6a0b
am: ae07650724

Change-Id: I43d075a57c5d327f3949408da7ed4890b0b045f4
2017-07-18 22:15:30 +00:00
Fan Zhang
3f8408e2b2 BidiFormat wrap version code in installed app detail UI
Change-Id: Ib592e4504331c4fc334ef5257e3d6d21c08098c0
Fix: 37862201
Test: visual
2017-07-18 15:15:10 -07:00
Phil Weaver
ae07650724 Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91 am: ade8640d4d
am: 57f1af6a0b

Change-Id: I50c783c642a0f1a86535c2423dd335d2e4ec2999
2017-07-18 22:11:43 +00:00
Phil Weaver
57f1af6a0b Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91
am: ade8640d4d

Change-Id: I77a9c4c0d8ce78a02615c5e37bf1843c46a1e5d8
2017-07-18 22:03:51 +00:00
Phil Weaver
b2d3c5e392 Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3 am: a1426f209c am: 2e690de9cf am: 7a7d6b1d0c am: 3099a7f794
am: ce3fef5c99

Change-Id: Ie8bbee7db53b887311684ead2b2bd9d82ff8ba58
2017-07-18 21:56:14 +00:00
Phil Weaver
7c3daa9ba5 Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3 am: a1426f209c am: 2e690de9cf am: 7a7d6b1d0c am: 3099a7f794
am: ce3fef5c99

Change-Id: I73eb7f86fd59536f8e9674a7406f83a3711b653e
2017-07-18 21:56:10 +00:00
Phil Weaver
ade8640d4d Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours
am: 6fee9a5e91

Change-Id: I463a22c05f439acd264c21cb99d2700e9600b78d
2017-07-18 21:55:39 +00:00
Fan Zhang
465d79776f Improve search indexing time.
- Some import clean up.
- Add timing log to track indexing time breakdown.
- Remove isAvailable() from UserDictionaryPreferenceController.

Bug: 36391685
Test: rebuild
Change-Id: If154c5dafba5d21cb1020497c44fbf67f03ad820
2017-07-18 14:53:49 -07:00
Rajeev Kumar
e19cd4828e Data plan usage summary fragment.
Change-Id: I2d928d1b5313b723450c8f5a45ff944b99dc3d5d
Note: These changes are required for Data balance UI.
Bug: 62349208
Test: make RunSettingsRoboTests -j40
2017-07-18 14:52:58 -07:00
Phil Weaver
ce3fef5c99 Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3 am: a1426f209c am: 2e690de9cf am: 7a7d6b1d0c
am: 3099a7f794

Change-Id: Ib02617e2779b6da6569182cd94936dafc07b7422
2017-07-18 21:48:55 +00:00
Phil Weaver
6fee9a5e91 Merge "Back-port ag/2491664" into nyc-dev
am: 3adf585961  -s ours

Change-Id: I8ba7e805110028752e1968e38ac548fcd4194438
2017-07-18 21:44:43 +00:00
Phil Weaver
3099a7f794 Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3 am: a1426f209c am: 2e690de9cf
am: 7a7d6b1d0c

Change-Id: I7a12d05b79c4a78e14fccf5288c9bea50ae4c4d9
2017-07-18 21:43:53 +00:00
Phil Weaver
7a7d6b1d0c Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3 am: a1426f209c
am: 2e690de9cf

Change-Id: Idb805deec53765994f5ed8a1bd7b1f56d6717b3b
2017-07-18 21:24:36 +00:00
Phil Weaver
3adf585961 Merge "Back-port ag/2491664" into nyc-dev 2017-07-18 21:23:17 +00:00
Phil Weaver
2e690de9cf Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3
am: a1426f209c

Change-Id: I410bcb403ace5044da8f98fadbb622a44d21021b
2017-07-18 21:13:41 +00:00
Phil Weaver
a1426f209c Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349
am: af26bae8b3

Change-Id: I0dc45ca53a9c60c830795d6686a0d86efa356f4e
2017-07-18 21:09:55 +00:00
Phil Weaver
3ca763f1b0 Merge "Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69 am: 2e2e6fcc04 am: 625d4bffc7 am: 066f79adc3 am: f7d3537fcd" into oc-dr1-dev-plus-aosp
am: aa0772ff7e

Change-Id: I310d25174d3c24c749f4d77c29eb154ef4ed7cf6
2017-07-18 21:09:28 +00:00
Phil Weaver
84c5bd8a5a Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69 am: 2e2e6fcc04 am: 625d4bffc7 am: 066f79adc3 am: e8f916bf97
am: 702d130b13

Change-Id: I385c7679197c6ac29910fdc15d911df682a950c1
2017-07-18 21:08:56 +00:00
Android Build Merger (Role)
aa0772ff7e Merge "Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69 am: 2e2e6fcc04 am: 625d4bffc7 am: 066f79adc3 am: f7d3537fcd" into oc-dr1-dev-plus-aosp 2017-07-18 21:06:44 +00:00
Phil Weaver
702d130b13 Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69 am: 2e2e6fcc04 am: 625d4bffc7 am: 066f79adc3
am: e8f916bf97

Change-Id: Ibeb5914563f0e67d8919b2cc2ddf100d5eba70b8
2017-07-18 21:06:27 +00:00
Phil Weaver
254f21b655 Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69 am: 2e2e6fcc04 am: 625d4bffc7 am: 066f79adc3
am: f7d3537fcd

Change-Id: If19362bb1a73a34b2783d6c1777aef37d7f8941e
2017-07-18 21:06:27 +00:00
Lei Yu
0038e448e1 Merge "Never store battery stats for cache" into oc-dr1-dev am: 8f8797f768
am: c150df6f8e

Change-Id: Iea0ac999b8f4dea20e0252b91b3013a5740ce353
2017-07-18 21:06:25 +00:00
Lei Yu
c150df6f8e Merge "Never store battery stats for cache" into oc-dr1-dev
am: 8f8797f768

Change-Id: I7b0408d12da25e4a89091110e78a9cdb60993d75
2017-07-18 21:04:29 +00:00
Phil Weaver
e8f916bf97 Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69 am: 2e2e6fcc04 am: 625d4bffc7
am: 066f79adc3

Change-Id: I9d4b01aff8483315c34874052bc1dca69f9be680
2017-07-18 21:04:27 +00:00
Phil Weaver
f7d3537fcd Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69 am: 2e2e6fcc04 am: 625d4bffc7
am: 066f79adc3

Change-Id: I3645f94b7220a956a95e13350e51e49a41204dcb
2017-07-18 21:04:27 +00:00
Phil Weaver
066f79adc3 Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69 am: 2e2e6fcc04
am: 625d4bffc7

Change-Id: Idb85f53bc0ad17856ee65b4cc2240bef6710851c
2017-07-18 21:02:30 +00:00
Phil Weaver
af26bae8b3 Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9
am: 55b3b1f349

Change-Id: I89635be6d5f768bd4780dd1b6daeb30e9cbab4d2
2017-07-18 20:59:48 +00:00
Phil Weaver
625d4bffc7 Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69
am: 2e2e6fcc04

Change-Id: I2d9d6a7fb0ac1d88a4e910e9e23e7160bbfcdafd
2017-07-18 20:58:54 +00:00
Phil Weaver
2e2e6fcc04 Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e
am: 85aa9ccc69

Change-Id: I8d411e2b84113763c49ec5c627f966da662a42b6
2017-07-18 20:57:24 +00:00
Lei Yu
8f8797f768 Merge "Never store battery stats for cache" into oc-dr1-dev 2017-07-18 20:55:58 +00:00
Phil Weaver
85aa9ccc69 Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac
am: ba26fabe3e

Change-Id: I78f285821bc170c9a32b6e911e38826123c81820
2017-07-18 20:54:26 +00:00
Phil Weaver
55b3b1f349 Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94
am: 46592e90a9

Change-Id: If666cdb52e2565e889fd026917eaea20502ca59e
2017-07-18 20:54:21 +00:00
Phil Weaver
ba26fabe3e Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671
am: 91f4a42dac

Change-Id: Iaf412cbcc4b9a3513ba27672ae2e1cfc04e57da5
2017-07-18 20:52:25 +00:00
Phil Weaver
91f4a42dac Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d
am: 57aa22c671

Change-Id: Ia487b2e3c0ee6c4eace1502704fda873e3690300
2017-07-18 20:49:55 +00:00
Phil Weaver
57aa22c671 Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780
am: 5d3967338d

Change-Id: Idcd6c6ab5a7cf0a594236a41a949031ed3e9855c
2017-07-18 20:47:53 +00:00
Phil Weaver
46592e90a9 Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d
am: 4c70016a94

Change-Id: I0b78bc04741d8b0d2d7af292484a025d0c62fd6a
2017-07-18 20:47:09 +00:00
Phil Weaver
5d3967338d Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9
am: f6b1267780

Change-Id: I2e61b6da4262cf05ca30e2c2d505eb9cae017a9a
2017-07-18 20:46:34 +00:00